Backed out changeset e0f41e4a4bc4 (bug 1344132) for failing reftest reftest-opaque-layer-fail.html. r=backout on a CLOSED TREE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 26 Apr 2017 13:15:29 +0200
changeset 403187 1d3a3ae57b06ae9ef71cf670727ee099aa1e248c
parent 403186 6232431e65ef49c045f822c4c1c1335f9ff6d2a9
child 403188 28e4528663c45f76f8faf5111db3cf59bb0f9154
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1344132
milestone55.0a1
backs oute0f41e4a4bc4ef6fe27e83c0017ee20e13bb9c2c
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 changeset e0f41e4a4bc4 (bug 1344132) for failing reftest reftest-opaque-layer-fail.html. r=backout on a CLOSED TREE
layout/tools/reftest/reftest.jsm
--- a/layout/tools/reftest/reftest.jsm
+++ b/layout/tools/reftest/reftest.jsm
@@ -795,30 +795,21 @@ function AddPrefSettings(aWhere, aPrefNa
     } else if (valType == "number" && (parseInt(prefVal) == prefVal)) {
         prefType = PREF_INTEGER;
     } else {
         return false;
     }
     var setting = { name: aPrefName,
                     type: prefType,
                     value: prefVal };
-
-    if (gCompareStyloToGecko && aPrefName != "layout.css.servo.enabled") {
-        // ref-pref() is ignored, test-pref() and pref() are added to both
-        if (aWhere != "ref-") {
-            aTestPrefSettings.push(setting);
-            aRefPrefSettings.push(setting);
-        }
-    } else {
-        if (aWhere != "ref-") {
-            aTestPrefSettings.push(setting);
-        }
-        if (aWhere != "test-") {
-            aRefPrefSettings.push(setting);
-        }
+    if (aWhere != "ref-") {
+        aTestPrefSettings.push(setting);
+    }
+    if (aWhere != "test-") {
+        aRefPrefSettings.push(setting);
     }
     return true;
 }
 
 function ReadTopManifest(aFileURL, aFilter)
 {
     var url = gIOService.newURI(aFileURL);
     if (!url)
@@ -1161,22 +1152,18 @@ function ReadManifest(aURL, inherited_st
                                      gIOService.newURI(items[2], null, listURL)];
             var prettyPath = runHttp
                            ? gIOService.newURI(items[1], null, listURL).spec
                            : testURI.spec;
             secMan.checkLoadURIWithPrincipal(principal, testURI,
                                              CI.nsIScriptSecurityManager.DISALLOW_SCRIPT);
             secMan.checkLoadURIWithPrincipal(principal, refURI,
                                              CI.nsIScriptSecurityManager.DISALLOW_SCRIPT);
-            var type = items[0];
-            if (gCompareStyloToGecko) {
-                type = TYPE_REFTEST_EQUAL;
-                refURI = testURI;
-            }
-            AddTestItem({ type: type,
+
+            AddTestItem({ type: items[0],
                           expected: expected_status,
                           allowSilentFail: allow_silent_fail,
                           prettyPath: prettyPath,
                           minAsserts: minAsserts,
                           maxAsserts: maxAsserts,
                           needsFocus: needs_focus,
                           slow: slow,
                           prefSettings1: testPrefSettings,