Backed out changeset 736e01530c6d (bug 1667491) for perma failures on…

… 1667491.html. CLOSED TREE
iaxat · Sep 30, 2020 · e8fa10f · e8fa10f
1 parent c955285
commit e8fa10f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 41 deletions.
diff --git a/docshell/base/crashtests/1667491.html b/docshell/base/crashtests/1667491.html
diff --git a/docshell/base/crashtests/crashtests.list b/docshell/base/crashtests/crashtests.list
@@ -18,4 +18,3 @@ load 1341657.html
 load 1584467.html
 load 1614211-1.html
 load 1617315-1.html
-pref(dom.disable_open_during_load,false) pref(security.data_uri.unique_opaque_origin,false) pref(security.data_uri.block_toplevel_data_uri_navigations,false) load 1667491.html
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
@@ -1223,18 +1223,18 @@ nsDocumentViewer::PermitUnload(PermitUnloadAction aAction,
   bool foundBlocker = false;
   bool foundOOPListener = false;
   bc->PreOrderWalk([&](BrowsingContext* aBC) {
-    if (!aBC->IsInProcess()) {
-      WindowContext* wc = aBC->GetCurrentWindowContext();
-      if (wc && wc->HasBeforeUnload()) {
-        foundOOPListener = true;
-      }
-    } else if (aBC->GetDocShell()) {
-      nsCOMPtr<nsIContentViewer> contentViewer(
-          aBC->GetDocShell()->GetContentViewer());
+    if (aBC->IsInProcess()) {
+      nsCOMPtr<nsIContentViewer> contentViewer;
+      aBC->GetDocShell()->GetContentViewer(getter_AddRefs(contentViewer));
       if (contentViewer &&
           contentViewer->DispatchBeforeUnload() == eRequestBlockNavigation) {
         foundBlocker = true;
       }
+    } else {
+      WindowContext* wc = aBC->GetCurrentWindowContext();
+      if (wc && wc->HasBeforeUnload()) {
+        foundOOPListener = true;
+      }
     }
   });