Backed out changeset 40ac529f9ea0 (bug 1352669) for build bustage CLOSED TREE

MozReview-Commit-ID: GvzTtvlt4qi

layout/style/test/stylo-failures.md

@@ -38,6 +38,9 @@ to mochitest command.
 * Animation support:
   * SMIL Animation
     * test_restyles_in_smil_animation.html [2]
+* console support bug 1352669
+  * test_bug413958.html `monitorConsole` [3]
+  * test_parser_diagnostics_unprintables.html [550]
 * @namespace support:
   * test_namespace_rule.html: bug 1355715 [6]
 * test_font_feature_values_parsing.html: \@font-feature-values support bug 1355721 [107]

layout/style/test/test_bug413958.html

@@ -39,19 +39,18 @@ var tests = [
     s.color = "black";
   },
 ];
-const isStylo = SpecialPowers.getBoolPref('layout.css.servo.enabled', false);
 var results = [
   [ { errorMessage: /Unknown property \u2018nosuchprop\u2019/,
-      lineNumber: 1, columnNumber: isStylo ? 4 : 14,
+      lineNumber: 1, columnNumber: 14,
       sourceLine: "#s1{nosuchprop:auto; color:black}" },
     { errorMessage: /Unknown property \u2018nosuchprop\u2019/,
-      lineNumber: 2, columnNumber: isStylo ? 4 : 14, sourceLine:
+      lineNumber: 2, columnNumber: 14, sourceLine:
       "#s2{nosuchprop:auto; color:black}invalid?sel{}#s3{color:black}" },
     { errorMessage: /Ruleset ignored due to bad selector/,
-      lineNumber: 2, columnNumber: isStylo ? 33 : 40, sourceLine:
+      lineNumber: 2, columnNumber: 40, sourceLine:
       "#s2{nosuchprop:auto; color:black}invalid?sel{}#s3{color:black}" } ],
   [ { errorMessage: /parsing value for \u2018width\u2019/,
-      lineNumber: 0, columnNumber: isStylo ? 0 : 6,
+      lineNumber: 0, columnNumber: 6,
       sourceLine: "width:200;color:black" } ],
   [ { errorMessage: /parsing value for \u2018width\u2019/,
       lineNumber: 0, columnNumber: 0,

layout/style/test/test_parser_diagnostics_unprintables.html

@@ -23,7 +23,7 @@
 // Each "pattern" is tested once with each of the "substitution"s below:
 // <t>, <i>, and <s> are replaced by the t:, i:, and s: fields of
 // each substitution object in turn.
-let patterns = [
+const patterns = [
   // REPORT_UNEXPECTED_P (only ever used in contexts where identifier-like
   // escaping is appropriate)
   { i: "<t>|x{}",                 o: "prefix \u2018<i>\u2019" },
@@ -42,20 +42,12 @@ let patterns = [
   { i: "x{ '<t>'}" ,       o: "declaration but found \u2018'<s>'\u2019." },
   // _Bad_String
   { i: "x{ '<t>\n}",      o: "declaration but found \u2018'<s>\u2019." },
+  // _URL
+  { i: "x{ url('<t>')}",   o: "declaration but found \u2018url('<s>')\u2019." },
+  // _Bad_URL
+  { i: "x{ url('<t>'.)}" , o: "declaration but found \u2018url('<s>'\u2019." }
 ];
 
-const isStylo = SpecialPowers.getBoolPref('layout.css.servo.enabled', false);
-
-// Stylo's CSS parser only reports the 'url(' token, not the actual bad URL.
-if (!isStylo) {
-  patterns.push(
-    // _URL
-    { i: "x{ url('<t>')}",   o: "declaration but found \u2018url('<s>')\u2019." })
-  patterns.push(
-    // _Bad_URL
-    { i: "x{ url('<t>'.)}" , o: "declaration but found \u2018url('<s>'\u2019." });
-}
-
 // Blocks of characters to test, and how they should be escaped when
 // they appear in identifiers and string constants.
 const substitutions = [