Backed out 2 changesets (bug 1566196) for bc failures in CTypes.cpp. CLOSED TREE
authorBrindusan Cristian <cbrindusan@mozilla.com>
Sat, 07 Sep 2019 02:28:58 +0300
changeset 553446 9c23af8989c16efc8f866c1778ccaffa2be2cb19
parent 553445 962be1fcc7c5a5cf6998875cf63b3b2ec6420d8b
child 553447 9bfff4f90b03cb7d55a400e8c39b15ac6815c5a4
push id12169
push userffxbld-merge
push dateMon, 14 Oct 2019 16:59:29 +0000
treeherdermozilla-beta@c819687300ed [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1566196
milestone71.0a1
backs outeaf4a3284f00fb06442ba447def6d1f244328df0
2de26156c57192bb1929f9097ca42c9adbcc1f73
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 1566196) for bc failures in CTypes.cpp. CLOSED TREE Backed out changeset eaf4a3284f00 (bug 1566196) Backed out changeset 2de26156c571 (bug 1566196)
browser/base/content/aboutFrameCrashed.html
dom/ipc/tests/browser.ini
dom/ipc/tests/browser_crash_oopiframe.js
--- a/browser/base/content/aboutFrameCrashed.html
+++ b/browser/base/content/aboutFrameCrashed.html
@@ -1,17 +1,16 @@
 <!DOCTYPE html>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html>
 <head>
-  <meta http-equiv="Content-Security-Policy" content="default-src chrome:" />
   <link rel="stylesheet" type="text/css" media="all"
         href="chrome://global/skin/in-content/info-pages.css"/>
   <link rel="stylesheet" type="text/css" media="all"
         href="chrome://browser/skin/aboutFrameCrashed.css"/>
 </head>
 <body>
 </body>
 </html>
--- a/dom/ipc/tests/browser.ini
+++ b/dom/ipc/tests/browser.ini
@@ -1,15 +1,16 @@
 [DEFAULT]
 support-files =
   file_disableScript.html
   file_domainPolicy_base.html
   file_cancel_content_js.html
 
 [browser_crash_oopiframe.js]
+skip-if = true # Disabled until bug 1566196 is fixed
 [browser_domainPolicy.js]
 skip-if = fission
 [browser_memory_distribution_telemetry.js]
 skip-if = !e10 # This is an e10s only probe.
 [browser_cancel_content_js.js]
 fail-if = fission
 skip-if = !e10s # This is an e10s only probe.
 [browser_ElapsedTime.js]
--- a/dom/ipc/tests/browser_crash_oopiframe.js
+++ b/dom/ipc/tests/browser_crash_oopiframe.js
@@ -50,40 +50,38 @@ add_task(async function() {
     iframeBC
   );
 
   let eventFiredPromise = BrowserTestUtils.waitForEvent(
     browser,
     "oop-browser-crashed"
   );
 
-  info("Waiting for oop-browser-crashed event.");
   await eventFiredPromise.then(event => {
     isnot(
       event.browsingContextId,
       rootBC,
       "top frame browsing context id not expected."
     );
 
     is(
       event.browsingContextId,
       iframeBC.id,
       "oop frame browsing context id expected."
     );
   });
 
-  // The BrowsingContext is re-used, but the currentWindowGlobal
-  // might still be getting set up at this point. We poll to wait
-  // until its created and available.
-  await BrowserTestUtils.waitForCondition(() => {
-    return iframeBC.currentWindowGlobal;
-  });
+  info("Wait for a new browsing context to get attached to our oop iframe.");
+  await BrowserTestUtils.waitForCondition(
+    () => rootBC.getChildren()[0] != iframeBC
+  );
 
+  let newIframeBC = rootBC.getChildren()[0];
   let newIframeURI = await SpecialPowers.spawn(
-    iframeBC,
+    newIframeBC,
     [],
     () => content.document.documentURI
   );
 
   ok(
     newIframeURI.startsWith("about:framecrashed"),
     "The iframe is now pointing at about:framecrashed"
   );