Fix bug 635776. r=bz, a=jst
authorOlli.Pettay@gmail.com
Wed, 02 Mar 2011 21:43:09 -0800
changeset 63302 e79b2b60d39488dfc295fc56345d35c0e7b328d3
parent 63301 e633e7a4af4b7ce6a45921b051eb24f4f652a81c
child 63309 c046188bb2f968cc0b45e1e9749e7bcb01f9815d
push id19136
push userjst@mozilla.com
push dateThu, 03 Mar 2011 05:43:25 +0000
treeherdermozilla-central@e79b2b60d394 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz, jst
bugs635776
milestone2.0b13pre
first release with
nightly linux32
e79b2b60d394 / 4.0b13pre / 20110303030406 / files
nightly linux64
e79b2b60d394 / 4.0b13pre / 20110303030406 / files
nightly mac
e79b2b60d394 / 4.0b13pre / 20110303030406 / files
nightly win32
e79b2b60d394 / 4.0b13pre / 20110303030406 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
Fix bug 635776. r=bz, a=jst
xpfe/appshell/src/nsXULWindow.cpp
--- a/xpfe/appshell/src/nsXULWindow.cpp
+++ b/xpfe/appshell/src/nsXULWindow.cpp
@@ -1811,16 +1811,18 @@ NS_IMETHODIMP nsXULWindow::CreateNewCont
       if (!NS_ProcessNextEvent(thread))
         break;
     }
     JSContext *cx;
     stack->Pop(&cx);
     NS_ASSERTION(cx == nsnull, "JSContextStack mismatch");
   }
 
+  NS_ENSURE_STATE(xulWin->mPrimaryContentShell);
+
   *_retval = newWindow;
   NS_ADDREF(*_retval);
 
   NS_TIMELINE_LEAVE("nsXULWindow::CreateNewContentWindow");
   return NS_OK;
 }
 
 void nsXULWindow::EnableParent(PRBool aEnable)