Backed out changeset 773035d73263 (bug 951413)
authorWes Kocher <wkocher@mozilla.com>
Fri, 10 Jan 2014 14:53:48 -0800
changeset 174701 f66e611710b9c7faa38175565afd520996c4ff6d
parent 174700 d8feaa30c122b88722480bd68f322f8003f5b4a3
child 174702 f41086293e2e0aa0295d29f52be382a8baed1054
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs951413
milestone28.0a2
backs out773035d732633dde063cc20ade3f8d6fa8f17201
Backed out changeset 773035d73263 (bug 951413)
dom/base/nsGlobalWindow.cpp
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -1365,17 +1365,16 @@ nsGlobalWindow::MaybeForgiveSpamCount()
                  "Unbalanced decrement of gOpenPopupSpamCount");
   }
 }
 
 void
 nsGlobalWindow::DropOuterWindowDocs()
 {
   MOZ_ASSERT(IsOuterWindow());
-  MOZ_ASSERT_IF(mDoc, !mDoc->EventHandlingSuppressed());
   mDoc = nullptr;
   mSuspendedDoc = nullptr;
 }
 
 void
 nsGlobalWindow::CleanUp()
 {
   // Guarantee idempotence.
@@ -1548,17 +1547,17 @@ nsGlobalWindow::FreeInnerObjects()
   }
 
   if (mDoc) {
     // Remember the document's principal and URI.
     mDocumentPrincipal = mDoc->NodePrincipal();
     mDocumentURI = mDoc->GetDocumentURI();
     mDocBaseURI = mDoc->GetDocBaseURI();
 
-    while (mDoc->EventHandlingSuppressed()) {
+    if (mDoc->EventHandlingSuppressed()) {
       mDoc->UnsuppressEventHandlingAndFireEvents(false);
     }
   }
 
   // Remove our reference to the document and the document principal.
   mFocusedNode = nullptr;
 
   if (mApplicationCache) {