Bug 1315403 followup - Fix mochitest failure and lint error.
authorXidorn Quan <me@upsuper.org>
Tue, 22 Nov 2016 13:59:47 +1100
changeset 323679 e4a9c304b47854575da6f7446465065424a2d878
parent 323678 af9ac4bc7efda4f4355dd35cf1ed12e317fa3b8f
child 323680 6ad1f8d07ea2490e61f17889a9eb85bfc1597bce
push id21
push usermaklebus@msu.edu
push dateThu, 01 Dec 2016 06:22:08 +0000
bugs1315403
milestone53.0a1
Bug 1315403 followup - Fix mochitest failure and lint error. MozReview-Commit-ID: KKKCybofksU CLOSED TREE
layout/style/test/test_system_font_serialization.html
testing/web-platform/meta/MANIFEST.json
--- a/layout/style/test/test_system_font_serialization.html
+++ b/layout/style/test/test_system_font_serialization.html
@@ -37,18 +37,18 @@ is(e.style.font, "message-box", "font ge
 e.setAttribute("style", "font-weight:bold;font:caption;line-height:3;");
 is(e.style.cssText, "font: caption; line-height: 3;", "serialize system font and font-family");
 is(e.style.font, "", "font getter should be empty");
 
 e.setAttribute("style", "font: menu; font-weight: -moz-use-system-font");
 is(e.style.cssText, "font: menu;", "serialize system font alone");
 is(e.style.font, "menu", "font getter returns value");
 
-e.setAttribute("style", "font: menu; font-weight: -moz-use-system-font ! important");
-is(e.style.cssText, "font: menu; font-weight: -moz-use-system-font ! important;", "serialize system font and subproperty that is important");
+e.setAttribute("style", "font: menu; font-weight: -moz-use-system-font !important");
+is(e.style.cssText, "font: menu; font-weight: -moz-use-system-font !important;", "serialize system font and subproperty that is important");
 is(e.style.font, "", "font getter returns nothing");
 
 e.setAttribute("style", "font: inherit; font-family: Helvetica;");
 
 var cssTextStr = "font-style: inherit; font-weight: inherit; font-size: inherit; line-height: inherit; font-size-adjust: inherit; font-stretch: inherit; font-feature-settings: inherit; font-language-override: inherit; font-kerning: inherit; font-synthesis: inherit; font-variant: inherit;";
 
 is(e.style.cssText, cssTextStr + " font-family: Helvetica;", "don't serialize system font for font:inherit");
 is(e.style.font, "", "font getter returns nothing");
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -15389,20 +15389,16 @@
         "path": "cors/status-preflight.htm",
         "url": "/cors/status-preflight.htm"
       },
       {
         "path": "cors/status.htm",
         "url": "/cors/status.htm"
       },
       {
-        "path": "cssom/serialization-CSSDeclaration-with-important.html",
-        "url": "/cssom/serialization-CSSDeclaration-with-important.html"
-      },
-      {
         "path": "cssom-view/HTMLBody-ScrollArea_quirksmode.html",
         "url": "/cssom-view/HTMLBody-ScrollArea_quirksmode.html"
       },
       {
         "path": "cssom-view/elementFromPoint.html",
         "url": "/cssom-view/elementFromPoint.html"
       },
       {
@@ -15421,16 +15417,20 @@
         "path": "cssom-view/scrolling-no-browsing-context.html",
         "url": "/cssom-view/scrolling-no-browsing-context.html"
       },
       {
         "path": "cssom-view/scrollingElement.html",
         "url": "/cssom-view/scrollingElement.html"
       },
       {
+        "path": "cssom/serialization-CSSDeclaration-with-important.html",
+        "url": "/cssom/serialization-CSSDeclaration-with-important.html"
+      },
+      {
         "path": "cssom/serialize-values.html",
         "url": "/cssom/serialize-values.html"
       },
       {
         "path": "custom-elements/CustomElementRegistry.html",
         "url": "/custom-elements/CustomElementRegistry.html"
       },
       {