Bug 1446954: Remove support for styloVsGecko reftests. r=xidorn

MozReview-Commit-ID: Ft2DyjdC04l

layout/tools/reftest/manifest.jsm

@@ -68,10 +68,6 @@ function ReadManifest(aURL, aFilter)
         AddRetainedDisplayListTestPrefs(sandbox, defaultTestPrefSettings,
                                         defaultRefPrefSettings);
     }
-    if (g.compareStyloToGecko) {
-        AddStyloTestPrefs(sandbox, defaultTestPrefSettings,
-                          defaultRefPrefSettings);
-    }
     for (var str of lines) {
         ++lineNo;
         if (str.charAt(0) == "#")
@@ -110,10 +106,6 @@ function ReadManifest(aURL, aFilter)
                 AddRetainedDisplayListTestPrefs(sandbox, defaultTestPrefSettings,
                                                 defaultRefPrefSettings);
             }
-            if (g.compareStyloToGecko) {
-                AddStyloTestPrefs(sandbox, defaultTestPrefSettings,
-                                  defaultRefPrefSettings);
-            }
             continue;
         }
 
@@ -327,7 +319,7 @@ function ReadManifest(aURL, aFilter)
             }
 
             var type = items[0];
-            if (g.compareStyloToGecko || g.compareRetainedDisplayLists) {
+            if (g.compareRetainedDisplayLists) {
                 type = TYPE_REFTEST_EQUAL;
 
                 // We expect twice as many assertion failures when running in
@@ -501,11 +493,9 @@ sandbox.compareRetainedDisplayLists = g.compareRetainedDisplayLists;
     } else {
         styloEnabled = prefs.getBoolPref("layout.css.servo.enabled", false);
     }
-    sandbox.stylo = styloEnabled && !g.compareStyloToGecko;
-    sandbox.styloVsGecko = g.compareStyloToGecko;
+    sandbox.stylo = styloEnabled;
 #else
     sandbox.stylo = false;
-    sandbox.styloVsGecko = false;
 #endif
 
     sandbox.skiaPdf = false;
@@ -583,13 +573,6 @@ function AddRetainedDisplayListTestPrefs(aSandbox, aTestPrefSettings,
                     aTestPrefSettings, aRefPrefSettings);
 }
 
-function AddStyloTestPrefs(aSandbox, aTestPrefSettings, aRefPrefSettings) {
-    AddPrefSettings("test-", "layout.css.servo.enabled", "true", aSandbox,
-                    aTestPrefSettings, aRefPrefSettings);
-    AddPrefSettings("ref-", "layout.css.servo.enabled", "false", aSandbox,
-                    aTestPrefSettings, aRefPrefSettings);
-}
-
 function AddPrefSettings(aWhere, aPrefName, aPrefValExpression, aSandbox, aTestPrefSettings, aRefPrefSettings) {
     var prefVal = Cu.evalInSandbox("(" + aPrefValExpression + ")", aSandbox);
     var prefType;
@@ -607,8 +590,7 @@ function AddPrefSettings(aWhere, aPrefName, aPrefValExpression, aSandbox, aTestP
                     type: prefType,
                     value: prefVal };
 
-    if ((g.compareStyloToGecko && aPrefName != "layout.css.servo.enabled") ||
-        (g.compareRetainedDisplayLists && aPrefName != "layout.display-list.retain")) {
+    if (g.compareRetainedDisplayLists && aPrefName != "layout.display-list.retain") {
         // ref-pref() is ignored, test-pref() and pref() are added to both
         if (aWhere != "ref-") {
             aTestPrefSettings.push(setting);
@@ -690,8 +672,6 @@ function CreateUrls(test) {
 
     let files = [test.url1, test.url2];
     [test.url1, test.url2] = files.map(FileToURI);
-    if (test.url2 && g.compareStyloToGecko)
-        test.url2 = test.url1;
 
     return test;
 }