Bug 794696 - Disable @supports for Firefox 17. r=bz a=akeybl
authorCameron McCormack <cam@mcc.id.au>
Sat, 06 Oct 2012 11:17:02 +1000
changeset 107076 b3966609aecc8691051d79e96f5f4c2074a5df33
parent 107075 9d03aa5abb5a10ebd4e7ab3a0757bf3fa5d64633
child 107077 fef8df9be7cd24fe4de793032ab2ecbaacbe7b0f
push id2215
push usercmccormack@mozilla.com
push dateSat, 06 Oct 2012 01:17:15 +0000
treeherdermozilla-aurora@b3966609aecc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz, akeybl
bugs794696
milestone17.0a2
Bug 794696 - Disable @supports for Firefox 17. r=bz a=akeybl
layout/reftests/w3c-css/submitted/conditional3/reftest.list
layout/reftests/w3c-css/submitted/reftest.list
layout/style/test/test_supports_rules.html
modules/libpref/src/init/all.js
--- a/layout/reftests/w3c-css/submitted/conditional3/reftest.list
+++ b/layout/reftests/w3c-css/submitted/conditional3/reftest.list
@@ -1,31 +1,31 @@
-== css-supports-001.xht support/pass.xht
-== css-supports-002.xht support/pass.xht
-== css-supports-003.xht support/pass.xht
-== css-supports-004.xht support/pass.xht
-== css-supports-005.xht support/pass.xht
-== css-supports-006.xht support/pass.xht
-== css-supports-007.xht support/pass.xht
-== css-supports-008.xht support/pass.xht
-== css-supports-009.xht support/pass.xht
-== css-supports-010.xht support/pass.xht
-== css-supports-011.xht support/pass.xht
-== css-supports-012.xht support/pass.xht
-== css-supports-013.xht support/pass.xht
-== css-supports-014.xht support/pass.xht
-== css-supports-015.xht support/pass.xht
-== css-supports-016.xht support/pass.xht
-== css-supports-017.xht support/pass.xht
-== css-supports-018.xht support/pass.xht
-== css-supports-019.xht support/pass.xht
-== css-supports-020.xht support/pass.xht
-== css-supports-021.xht support/pass.xht
-== css-supports-022.xht support/pass.xht
-== css-supports-023.xht support/pass.xht
-== css-supports-024.xht support/pass.xht
-== css-supports-025.xht support/pass.xht
-== css-supports-026.xht support/pass.xht
-== css-supports-027.xht support/pass.xht
-== css-supports-028.xht support/pass.xht
-== css-supports-029.xht support/pass.xht
-== css-supports-030.xht support/pass.xht
-== css-supports-031.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-001.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-002.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-003.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-004.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-005.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-006.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-007.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-008.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-009.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-010.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-011.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-012.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-013.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-014.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-015.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-016.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-017.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-018.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-019.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-020.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-021.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-022.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-023.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-024.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-025.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-026.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-027.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-028.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-029.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-030.xht support/pass.xht
+pref(layout.css.supports-rule.enabled,true) == css-supports-031.xht support/pass.xht
--- a/layout/reftests/w3c-css/submitted/reftest.list
+++ b/layout/reftests/w3c-css/submitted/reftest.list
@@ -12,17 +12,17 @@
 
 # Animations
 # include animations/reftest.list
 
 # Backgrounds and Borders Level 3
 # include background3/reftest.list
 
 # Conditional Rules Level 3
-skip-if(!prefs.getBoolPref("layout.css.supports-rule.enabled")) include conditional3/reftest.list
+include conditional3/reftest.list
 
 # Fonts Level 3
 # include fonts3/reftest.list
 
 # Image Values and Replaced Content Level 3
 # include images3/reftest.list
 
 # Media Queries Level 3
--- a/layout/style/test/test_supports_rules.html
+++ b/layout/style/test/test_supports_rules.html
@@ -25,19 +25,23 @@ https://bugzilla.mozilla.org/show_bug.cg
 <script type="application/javascript">
 
 /** Test for Bug 649740 **/
 
 function condition(s) {
   return s.replace(/^@supports\s*/, '').replace(/ \s*{\s*}\s*$/, '');
 }
 
-var sheet = document.getElementById("style").sheet;
+if (!SpecialPowers.getBoolPref("layout.css.supports-rule.enabled")) {
+  todo(false, "skipping test because pref is disabled");
+} else {
+  var sheet = document.getElementById("style").sheet;
 
-is(condition(sheet.cssRules[0].cssText), "(color: green)");
-is(condition(sheet.cssRules[1].cssText), "(color: green)");
-is(condition(sheet.cssRules[2].cssText), "((color: green))");
-is(condition(sheet.cssRules[3].cssText), "(color: green) and (color: blue)");
-is(condition(sheet.cssRules[4].cssText), "( Font:  20px serif ! Important)");
+  is(condition(sheet.cssRules[0].cssText), "(color: green)");
+  is(condition(sheet.cssRules[1].cssText), "(color: green)");
+  is(condition(sheet.cssRules[2].cssText), "((color: green))");
+  is(condition(sheet.cssRules[3].cssText), "(color: green) and (color: blue)");
+  is(condition(sheet.cssRules[4].cssText), "( Font:  20px serif ! Important)");
+}
 </script>
 </pre>
 </body>
 </html>
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1575,17 +1575,17 @@ pref("layout.css.dpi", -1);
 // automatically based on user settings for the platform (e.g., "UI scale factor"
 // on Mac). A positive value is used as-is. This effectively controls the size
 // of a CSS "px". This is only used for windows on the screen, not for printing.
 // XXX the default value here should be 0, but before we can set it to 0,
 // we have to get this feature working on all platforms.
 pref("layout.css.devPixelsPerPx", "1.0");
 
 // Is support for the the @supports rule enabled?
-pref("layout.css.supports-rule.enabled", true);
+pref("layout.css.supports-rule.enabled", false);
 
 // pref for which side vertical scrollbars should be on
 // 0 = end-side in UI direction
 // 1 = end-side in document/content direction
 // 2 = right
 // 3 = left
 pref("layout.scrollbar.side", 0);