Backed out 2 changesets (bug 1417138) for failing in slave/test/build/tests/reftest/tests/layout/reftests/xul/menulist-shrinkwrap-2.xul on a CLOSED TREE
authorNoemi Erli <nerli@mozilla.com>
Fri, 16 Feb 2018 04:48:23 +0200
changeset 404129 eeae793339e7e909bfe3fbcc8cf9732552d02c5d
parent 404128 5dc5ecd683c8475459f911a7250e58321e1a2733
child 404130 7194edc95a6e3fddb782154e757e5f6b01ca1ab1
push id99938
push usercbrindusan@mozilla.com
push dateFri, 16 Feb 2018 09:57:26 +0000
treeherdermozilla-inbound@5f2344531e28 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1417138
milestone60.0a1
backs out4e0d4c91940bb09ead646ef82c8666075175e69a
92fa88d94170eb1a52a912038bd4363b37872dac
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 1417138) for failing in slave/test/build/tests/reftest/tests/layout/reftests/xul/menulist-shrinkwrap-2.xul on a CLOSED TREE Backed out changeset 4e0d4c91940b (bug 1417138) Backed out changeset 92fa88d94170 (bug 1417138)
browser/components/contextualidentity/test/browser/browser_aboutURLs.js
modules/libpref/init/all.js
--- a/browser/components/contextualidentity/test/browser/browser_aboutURLs.js
+++ b/browser/components/contextualidentity/test/browser/browser_aboutURLs.js
@@ -2,41 +2,37 @@
 
 // For some about: URLs, they will take more time to load and cause timeout.
 // See Bug 1270998.
 requestLongerTimeout(2);
 
 add_task(async function() {
   let aboutURLs = [];
 
-  // List of about: URLs that may cause problem, so we skip them in this test.
-  let skipURLs = [
-    // about:credits will initiate network request.
+  // List of about: URLs that will initiate network requests.
+  let networkURLs = [
     "credits",
-    // about:telemetry will fetch Telemetry asynchronously and takes longer,
-    // so we skip this for now.
-    "telemetry",
-    // about:downloads causes a shutdown leak with stylo-chrome. bug 1419943.
-    "downloads"
+    "telemetry" // about:telemetry will fetch Telemetry asynchrounously and takes
+                // longer, we skip this for now.
   ];
 
   for (let cid in Cc) {
     let result = cid.match(/@mozilla.org\/network\/protocol\/about;1\?what\=(.*)$/);
     if (!result) {
       continue;
     }
 
     let aboutType = result[1];
     let contract = "@mozilla.org/network/protocol/about;1?what=" + aboutType;
     try {
       let am = Cc[contract].getService(Ci.nsIAboutModule);
       let uri = Services.io.newURI("about:" + aboutType);
       let flags = am.getURIFlags(uri);
       if (!(flags & Ci.nsIAboutModule.HIDE_FROM_ABOUTABOUT) &&
-          !skipURLs.includes(aboutType)) {
+          !networkURLs.includes(aboutType)) {
         aboutURLs.push(aboutType);
       }
     } catch (e) {
       // getService might have thrown if the component doesn't actually
       // implement nsIAboutModule
     }
   }
 
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5850,18 +5850,22 @@ pref("media.block-autoplay-until-in-fore
 pref("layout.css.servo.enabled", true);
 #else
 pref("layout.css.servo.enabled", false);
 #endif
 // Whether Stylo is enabled for chrome document?
 // If Stylo is not enabled, this pref doesn't take any effect.
 // Note that this pref is only read once when requested. Changing it
 // at runtime may have no effect.
+#ifdef MOZ_OLD_STYLE
+pref("layout.css.servo.chrome.enabled", false);
+#else
 pref("layout.css.servo.chrome.enabled", true);
 #endif
+#endif
 
 // TODO: Bug 1324406: Treat 'data:' documents as unique, opaque origins
 // If true, data: URIs will be treated as unique opaque origins, hence will use
 // a NullPrincipal as the security context.
 // Otherwise it will inherit the origin from parent node, this is the legacy
 // behavior of Firefox.
 pref("security.data_uri.unique_opaque_origin", true);