Bug 586808 - Incubator embedding: MozView crashes on destroy if page is not loaded [@ WebBrowserChrome::OnStateChange]. r=mark.finkle

Author: tmeshkova

common/embed.cpp

@@ -24,6 +24,7 @@
  *   Tobias Hunger <[email protected]>
  *   Steffen Imhof <[email protected]>
  *   Anton Rogaynis <[email protected]>
+ *   Tatiana Meshkova <[email protected]>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -175,6 +176,13 @@ class MozView::Private
         else if (NS_FAILED(consoleService->UnregisterListener(mConsoleListener)))
             cerr << "Failed to unregister console listener." << endl;
 
+        // disconnect listener before window destroy
+        nsCOMPtr<nsIWebProgressListener> listener = do_QueryInterface(mChrome);
+        nsCOMPtr<nsIWeakReference> thisListener(do_GetWeakReference(listener));
+        if (mWebBrowser)
+            mWebBrowser->RemoveWebBrowserListener(thisListener, NS_GET_IID(nsIWebProgressListener));
+        thisListener = nsnull;
+
         if (mChrome)
             mChrome->SetWebBrowser(0);
         if (mWebBrowser) {