diff --git a/browser/base/content/test/static/browser_parsable_css.js b/browser/base/content/test/static/browser_parsable_css.js index 1f55346acd7b..d630c450f8fc 100644 --- a/browser/base/content/test/static/browser_parsable_css.js +++ b/browser/base/content/test/static/browser_parsable_css.js @@ -67,6 +67,15 @@ let whitelist = [ isFromDevTools: true}, ]; +if (!Services.prefs.getBoolPref("layout.css.xul-box-display-values.content.enabled")) { + // These are UA sheets which use non-content-exposed `display` values. + whitelist.push({ + sourceName: /(skin\/shared\/Heartbeat|((?:res|gre-resources)\/(ua|html)))\.css$/i, + errorMessage: /Error in parsing value for .*\bdisplay\b/i, + isFromDevTools: false + }) +} + if (!Services.prefs.getBoolPref("full-screen-api.unprefix.enabled")) { whitelist.push({ sourceName: /(?:res|gre-resources)\/(ua|html)\.css$/i, diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list index 6f32488ebedd..633ebeee832a 100644 --- a/layout/generic/crashtests/crashtests.list +++ b/layout/generic/crashtests/crashtests.list @@ -652,8 +652,8 @@ load 1233607.html load 1234701-1.html load 1234701-2.html load 1271765.html -asserts(2) asserts-if(Android,1) load 1272983-1.html # bug 586628 -asserts(2) asserts-if(Android,1) load 1272983-2.html # bug 586628 +pref(layout.css.xul-box-display-values.content.enabled,true) asserts(2) asserts-if(Android,1) load 1272983-1.html # bug 586628 +pref(layout.css.xul-box-display-values.content.enabled,true) asserts(2) asserts-if(Android,1) load 1272983-2.html # bug 586628 load 1275059.html load 1278007.html load 1278080.html diff --git a/layout/reftests/box-ordinal/reftest.list b/layout/reftests/box-ordinal/reftest.list index 91de0baaa8e2..a79dbce8acaa 100644 --- a/layout/reftests/box-ordinal/reftest.list +++ b/layout/reftests/box-ordinal/reftest.list @@ -1,4 +1,4 @@ -== box-ordinal-with-out-of-flow-1.html box-ordinal-with-out-of-flow-1-ref.html +pref(layout.css.xul-box-display-values.content.enabled,true) == box-ordinal-with-out-of-flow-1.html box-ordinal-with-out-of-flow-1-ref.html == dynamic-1-remove-to-none-grouped.xul dynamic-1-ref.xul == dynamic-1-add-to-one-grouped.xul dynamic-1-ref.xul == dynamic-1-remove-to-one-grouped-1.xul dynamic-1-ref.xul diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index e1d2012057e8..45e97ddfddad 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -417,7 +417,7 @@ fuzzy-if(webrender&&winWidget,35-35,1-1) == 321402-3.xul 321402-3-ref.xul == 321402-5.xul 321402-5-ref.xul == 321402-6.xul 321402-6-ref.xul == 321738-1.html 321738-1-ref.html -== 322436-1.html 322436-1-ref.html +pref(layout.css.xul-box-display-values.content.enabled,true) == 322436-1.html 322436-1-ref.html == 322461-1.xml 322461-1-ref.html == 323656-1.html 323656-1-ref.html == 323656-2.html 323656-2-ref.html @@ -956,7 +956,7 @@ fails == 411585-3.html 411585-3-ref.html # bug 426909 == 412607-1b.html 412607-1-ref.html random-if(Android) == 412679-1.html 412679-1-ref.html fuzzy-if(skiaContent,1,17) == 412679-2.html 412679-2-ref.html -== 413027-1.html 413027-1-ref.html +pref(layout.css.xul-box-display-values.content.enabled,true) == 413027-1.html 413027-1-ref.html fails == 413027-2.html 413027-2-ref.html fails == 413027-3.html 413027-3-ref.html == 413286-1a.html 413286-1-ref.html @@ -1409,7 +1409,7 @@ fuzzy-if(Android,5,2800) == 506481-1.html 506481-1-ref.html == 507762-3.html 507762-1-ref.html == 507762-4.html 507762-2-ref.html random == 508816-1.xul 508816-1-ref.xul # Bug 1375012 -== 508816-2.html 508816-2-ref.html +pref(layout.css.xul-box-display-values.content.enabled,true) == 508816-2.html 508816-2-ref.html skip-if(isDebugBuild) == 508908-1.xul 508908-1-ref.xul == 508919-1.xhtml 508919-1-ref.xhtml == 509155-1.xhtml 509155-1-ref.xhtml @@ -1449,7 +1449,7 @@ fuzzy-if(skiaContent,5,50) == 526463-1.html 526463-1-ref.html == 528038-2.html 528038-2-ref.html == 528096-1.html 528096-1-ref.html == 530686-1.html 530686-1-ref.html -== 531098-1.html 531098-1-ref.html +pref(layout.css.xul-box-display-values.content.enabled,true) == 531098-1.html 531098-1-ref.html fuzzy-if(Android,2,48) == 531200-1.html 531200-1-ref.html == 531371-1.html 531371-1-ref.html == 534526-1a.html 534526-1-ref.html @@ -1564,7 +1564,7 @@ random-if(!winWidget) random-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)) == 5 random-if(!winWidget) fails-if(winWidget&&!dwrite) random-if(winWidget&&dwrite) != 574907-3.html 574907-3-notref.html == 577838-1.html 577838-1-ref.html == 577838-2.html 577838-2-ref.html -== 579323-1.html 579323-1-ref.html +pref(layout.css.xul-box-display-values.content.enabled,true) == 579323-1.html 579323-1-ref.html == 579349-1.html 579349-1-ref.html == 579655-1.html 579655-1-ref.html skip-if(!haveTestPlugin) fails-if(Android) HTTP == 579808-1.html 579808-1-ref.html diff --git a/layout/style/test/test_flexbox_child_display_values.xhtml b/layout/style/test/test_flexbox_child_display_values.xhtml index bcb06fcab753..ea1fa49f29d9 100644 --- a/layout/style/test/test_flexbox_child_display_values.xhtml +++ b/layout/style/test/test_flexbox_child_display_values.xhtml @@ -139,8 +139,6 @@ function main() { var dispValsThatComputeToBlockInAFlexContainer = [ "inline", "inline-block", - "-moz-box", - "-moz-inline-box", ]; dispValsThatComputeToBlockInAFlexContainer.forEach( diff --git a/layout/style/test/test_layout_css_xul_display_values_content_enabled.html b/layout/style/test/test_layout_css_xul_display_values_content_enabled.html index 8b58de47924a..8fce5fc84d51 100644 --- a/layout/style/test/test_layout_css_xul_display_values_content_enabled.html +++ b/layout/style/test/test_layout_css_xul_display_values_content_enabled.html @@ -18,7 +18,10 @@ const VALUES = [ SimpleTest.waitForExplicitFinish(); SpecialPowers.pushPrefEnv( - {"set": [["layout.css.xul-display-values.content.enabled", true]]} + {"set": [ + ["layout.css.xul-display-values.content.enabled", true], + ["layout.css.xul-box-display-values.content.enabled", true], + ]} ).then(runTest); function runTest() { diff --git a/layout/style/test/test_non_content_accessible_values.html b/layout/style/test/test_non_content_accessible_values.html index 232b7f261537..c7704068b7b7 100644 --- a/layout/style/test/test_non_content_accessible_values.html +++ b/layout/style/test/test_non_content_accessible_values.html @@ -6,9 +6,8 @@