Bug 778355 - Don't clear mWindow in nsWebShellWindow's destructor; nsXULWindow will clear it when it's destroyed. r=roc
☠☠ backed out by 72966f49cf09 ☠ ☠
authorJustin Lebar <justin.lebar@gmail.com>
Mon, 30 Jul 2012 12:20:42 -0400
changeset 100883 20b67f48676c6afd5353b5ca621e2980e43a1abe
parent 100882 54a8f77d3d26c2c16f79af84036f2f2ca9530565
child 100884 6e30103582c44ea1ee8c25747bd3bed6671c0011
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersroc
bugs778355
milestone17.0a1
Bug 778355 - Don't clear mWindow in nsWebShellWindow's destructor; nsXULWindow will clear it when it's destroyed. r=roc
xpfe/appshell/src/nsWebShellWindow.cpp
--- a/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -87,22 +87,16 @@ nsWebShellWindow::nsWebShellWindow(PRUin
   : nsXULWindow(aChromeFlags)
   , mSPTimerLock("nsWebShellWindow.mSPTimerLock")
 {
 }
 
 
 nsWebShellWindow::~nsWebShellWindow()
 {
-  if (mWindow) {
-    mWindow->SetClientData(0);
-    mWindow->Destroy();
-    mWindow = nullptr; // Force release here.
-  }
-
   MutexAutoLock lock(mSPTimerLock);
   if (mSPTimer)
     mSPTimer->Cancel();
 }
 
 NS_IMPL_ADDREF_INHERITED(nsWebShellWindow, nsXULWindow)
 NS_IMPL_RELEASE_INHERITED(nsWebShellWindow, nsXULWindow)