Bug 1547086 Part 2 - Enable column-span preference to fix existing test failures. r=dbaron
authorTing-Yu Lin <tlin@mozilla.com>
Sat, 27 Apr 2019 22:03:54 +0000
changeset 530487 09a1e16dfaf1ec52411572132ec73ba444f2288d
parent 530486 145b3692b5935a43e3789c448b521f06e778f1c1
child 530488 42558e3db76ee15949c3eacd1182620435fa91d0
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs1547086
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1547086 Part 2 - Enable column-span preference to fix existing test failures. r=dbaron Differential Revision: https://phabricator.services.mozilla.com/D28893
layout/reftests/w3c-css/failures.list
layout/reftests/w3c-css/received/reftest.list
testing/web-platform/meta/css/css-multicol/multicol-breaking-000.html.ini
testing/web-platform/meta/css/css-multicol/multicol-breaking-001.html.ini
testing/web-platform/meta/css/css-multicol/multicol-height-block-child-001.xht.ini
testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-bottom-001.xht.ini
testing/web-platform/meta/css/css-multicol/parsing/column-span-valid.html.ini
testing/web-platform/meta/quirks/unitless-length/excluded-properties-002.html.ini
--- a/layout/reftests/w3c-css/failures.list
+++ b/layout/reftests/w3c-css/failures.list
@@ -231,17 +231,17 @@ fuzzy(0-135,0-80) css-multicol/multicol-
 fuzzy(0-135,0-821) css-multicol/multicol-gap-000.xht
 fuzzy(0-255,0-329) css-multicol/multicol-gap-001.xht
 fuzzy(0-204,0-930) fuzzy-if(skiaContent,0-208,0-930) css-multicol/multicol-gap-002.xht
 fuzzy(0-204,0-930) fuzzy-if(skiaContent,0-208,0-930) css-multicol/multicol-gap-003.xht
 fuzzy(0-107,0-1823) css-multicol/multicol-gap-fraction-001.xht
 fuzzy-if(winWidget||OSX||gtkWidget,0-204,0-1048) fuzzy-if(skiaContent,0-208,0-1048) css-multicol/multicol-gap-large-001.xht
 fuzzy(0-225,0-920) css-multicol/multicol-gap-large-002.xht
 fuzzy(0-204,0-930) fuzzy-if(skiaContent,0-208,0-930) css-multicol/multicol-gap-negative-001.xht
-fails css-multicol/multicol-height-block-child-001.xht
+pref(layout.css.column-span.enabled,true) css-multicol/multicol-height-block-child-001.xht
 fuzzy(0-255,0-3762) css-multicol/multicol-inherit-001.xht
 fuzzy(0-135,0-1893) css-multicol/multicol-inherit-002.xht
 fails-if(!OSX) random-if(OSX) css-multicol/multicol-inherit-003.xht
 fuzzy(0-97,0-264) css-multicol/multicol-list-item-001.xht
 fuzzy(0-73,0-1200) css-multicol/multicol-margin-001.xht
 fuzzy(0-73,0-1200) css-multicol/multicol-margin-002.xht
 fuzzy(0-243,0-3322) fuzzy-if(skiaContent,0-244,0-3322) css-multicol/multicol-margin-child-001.xht
 fuzzy(0-255,0-4008) css-multicol/multicol-nested-002.xht
@@ -269,28 +269,31 @@ fuzzy(0-127,0-500) css-multicol/multicol
 fuzzy(0-94,0-256) css-multicol/multicol-rule-hidden-000.xht
 fuzzy(0-127,0-500) css-multicol/multicol-rule-inset-000.xht
 fuzzy(0-127,0-500) css-multicol/multicol-rule-outset-000.xht
 fails-if(!OSX) random-if(OSX) css-multicol/multicol-rule-px-001.xht
 fuzzy(0-127,0-500) css-multicol/multicol-rule-ridge-000.xht
 fuzzy(0-106,0-354) css-multicol/multicol-rule-solid-000.xht
 fails-if(!OSX) random-if(OSX) css-multicol/multicol-rule-stacking-001.xht
 fails-if(!OSX||webrender) random-if(OSX) css-multicol/multicol-shorthand-001.xht
-fails css-multicol/multicol-span-000.xht
-fails css-multicol/multicol-span-all-001.xht
-fails css-multicol/multicol-span-all-002.xht
-fails css-multicol/multicol-span-all-003.xht
-fails css-multicol/multicol-span-all-margin-001.xht
-fails css-multicol/multicol-span-all-margin-002.xht
-fails css-multicol/multicol-span-all-margin-bottom-001.xht
-fails css-multicol/multicol-span-all-margin-nested-001.xht
-fails css-multicol/multicol-span-all-margin-nested-002.xht
-fails css-multicol/multicol-span-all-margin-nested-firstchild-001.xht
-fails css-multicol/multicol-span-float-001.xht
-fails css-multicol/multicol-span-none-001.xht
+
+# Bug 1547160: Fix existing reftests failure related to column-span
+pref(layout.css.column-span.enabled,true) fails css-multicol/multicol-span-000.xht
+pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-001.xht
+pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-002.xht
+pref(layout.css.column-span.enabled,true) fails-if(!OSX) random-if(OSX) css-multicol/multicol-span-all-003.xht
+pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-margin-001.xht
+pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-margin-002.xht
+pref(layout.css.column-span.enabled,true) fails css-multicol/multicol-span-all-margin-bottom-001.xht
+pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-margin-nested-001.xht
+pref(layout.css.column-span.enabled,true) fails css-multicol/multicol-span-all-margin-nested-002.xht
+pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-margin-nested-firstchild-001.xht
+pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-float-001.xht
+pref(layout.css.column-span.enabled,true) fails css-multicol/multicol-span-none-001.xht
+
 fails css-multicol/multicol-table-cell-001.xht
 fails css-multicol/multicol-table-cell-height-001.xht
 fails css-multicol/multicol-table-cell-height-002.xht
 fails css-multicol/multicol-table-cell-vertical-align-001.xht
 fuzzy(0-204,0-930) fuzzy-if(skiaContent,0-208,0-930) css-multicol/multicol-width-002.xht
 fails-if(!OSX) random-if(OSX) css-multicol/multicol-width-count-002.xht
 fails-if(!OSX) random-if(OSX) css-multicol/multicol-width-negative-001.xht
 fuzzy(0-225,0-1060) css-multicol/multicol-width-large-001.xht
@@ -303,17 +306,17 @@ fuzzy-if(OSX&&!webrender,255-255,100-150
 
 #This test seems to pass only on Linux-opt build, on everything else
 #Therefore using fuzzy annotation as a catch all
 fuzzy(0-255,0-2808) css-multicol/multicol-rule-large-001.xht
 
 # fails because column-span property not implemented (Bug 616436)
 fails css-multicol/multicol-fill-auto-block-children-001.xht
 fails css-multicol/multicol-fill-auto-block-children-002.xht
-fails css-multicol/multicol-span-all-block-sibling-003.xht
+pref(layout.css.column-span.enabled,true) fuzzy-if(winWidget,40-47,8-8) fuzzy-if(OSX,0-27,0-11) css-multicol/multicol-span-all-block-sibling-003.xht
 
 # skip these tests since they haven't been triaged yet.
 # These tests were added to the tree as part of an update for Bug 1430939.
 skip css-multicol/multicol-fill-balance-002.html
 skip css-multicol/multicol-gap-fraction-002.html
 skip css-multicol/multicol-rule-shorthand-2.xht
 skip css-multicol/multicol-width-ch-001.xht
 skip css-values/ex-calc-expression-001.html
--- a/layout/reftests/w3c-css/received/reftest.list
+++ b/layout/reftests/w3c-css/received/reftest.list
@@ -97,17 +97,17 @@ fuzzy(0-255,0-329) == css-multicol/multi
 fuzzy(0-204,0-930) fuzzy-if(skiaContent,0-208,0-930) == css-multicol/multicol-gap-002.xht css-multicol/multicol-gap-002-ref.xht
 fuzzy(0-204,0-930) fuzzy-if(skiaContent,0-208,0-930) == css-multicol/multicol-gap-003.xht css-multicol/multicol-gap-002-ref.xht
 fuzzy(0-107,0-1823) == css-multicol/multicol-gap-fraction-001.xht css-multicol/multicol-gap-fraction-001-ref.xht
 skip == css-multicol/multicol-gap-fraction-002.html reference/nothing.html
 fuzzy-if(winWidget||OSX||gtkWidget,0-204,0-1048) fuzzy-if(skiaContent,0-208,0-1048) == css-multicol/multicol-gap-large-001.xht css-multicol/multicol-gap-large-001-ref.xht
 fuzzy(0-225,0-920) == css-multicol/multicol-gap-large-002.xht css-multicol/multicol-gap-large-002-ref.xht
 fuzzy(0-204,0-930) fuzzy-if(skiaContent,0-208,0-930) == css-multicol/multicol-gap-negative-001.xht css-multicol/multicol-gap-002-ref.xht
 == css-multicol/multicol-height-001.xht css-multicol/multicol-height-001-ref.xht
-fails == css-multicol/multicol-height-block-child-001.xht css-multicol/multicol-height-block-child-001-ref.xht
+pref(layout.css.column-span.enabled,true) == css-multicol/multicol-height-block-child-001.xht css-multicol/multicol-height-block-child-001-ref.xht
 fuzzy(0-255,0-3762) == css-multicol/multicol-inherit-001.xht css-multicol/multicol-inherit-001-ref.xht
 fuzzy(0-135,0-1893) == css-multicol/multicol-inherit-002.xht css-multicol/multicol-inherit-002-ref.xht
 fails-if(!OSX) random-if(OSX) == css-multicol/multicol-inherit-003.xht css-multicol/multicol-inherit-3-ref.xht
 fuzzy(0-97,0-264) == css-multicol/multicol-list-item-001.xht css-multicol/multicol-list-item-001-ref.xht
 fuzzy(0-73,0-1200) == css-multicol/multicol-margin-001.xht reference/ref-filled-green-100px-square.xht
 fuzzy(0-73,0-1200) == css-multicol/multicol-margin-002.xht reference/ref-filled-green-100px-square.xht
 fuzzy(0-243,0-3322) fuzzy-if(skiaContent,0-244,0-3322) == css-multicol/multicol-margin-child-001.xht css-multicol/multicol-margin-child-001-ref.xht
 fuzzy(0-255,0-4008) == css-multicol/multicol-nested-002.xht css-multicol/multicol-nested-002-ref.xht
@@ -145,29 +145,29 @@ fuzzy(0-127,0-500) == css-multicol/multi
 fails-if(!OSX) random-if(OSX) == css-multicol/multicol-rule-px-001.xht css-multicol/multicol-rule-ref.xht
 fuzzy(0-127,0-500) == css-multicol/multicol-rule-ridge-000.xht css-multicol/multicol-rule-ridge-000-ref.xht
 == css-multicol/multicol-rule-samelength-001.xht css-multicol/multicol-rule-samelength-001-ref.xht
 == css-multicol/multicol-rule-shorthand-001.xht css-multicol/multicol-rule-samelength-001-ref.xht
 skip == css-multicol/multicol-rule-shorthand-2.xht css-multicol/multicol-rule-shorthand-2-ref.xht
 fuzzy(0-106,0-354) == css-multicol/multicol-rule-solid-000.xht css-multicol/multicol-rule-solid-000-ref.xht
 fails-if(!OSX) random-if(OSX) == css-multicol/multicol-rule-stacking-001.xht css-multicol/multicol-rule-stacking-ref.xht
 fails-if(!OSX||webrender) random-if(OSX) == css-multicol/multicol-shorthand-001.xht css-multicol/multicol-rule-ref.xht
-fails == css-multicol/multicol-span-000.xht css-multicol/multicol-span-000-ref.xht
-fails == css-multicol/multicol-span-all-001.xht css-multicol/multicol-span-all-001-ref.xht
-fails == css-multicol/multicol-span-all-002.xht css-multicol/multicol-span-all-002-ref.xht
-fails == css-multicol/multicol-span-all-003.xht css-multicol/multicol-count-002-ref.xht
-fails == css-multicol/multicol-span-all-block-sibling-003.xht css-multicol/multicol-span-all-block-sibling-3-ref.xht
-fails == css-multicol/multicol-span-all-margin-001.xht css-multicol/multicol-span-all-margin-001-ref.xht
-fails == css-multicol/multicol-span-all-margin-002.xht css-multicol/multicol-span-all-margin-002-ref.xht
-fails == css-multicol/multicol-span-all-margin-bottom-001.xht css-multicol/multicol-span-all-margin-bottom-001-ref.xht
-fails == css-multicol/multicol-span-all-margin-nested-001.xht css-multicol/multicol-span-all-margin-nested-001-ref.xht
-fails == css-multicol/multicol-span-all-margin-nested-002.xht css-multicol/multicol-span-all-margin-nested-001-ref.xht
-fails == css-multicol/multicol-span-all-margin-nested-firstchild-001.xht css-multicol/multicol-span-all-margin-nested-firstchild-ref.xht
-fails == css-multicol/multicol-span-float-001.xht css-multicol/multicol-span-float-001-ref.xht
-fails == css-multicol/multicol-span-none-001.xht css-multicol/multicol-span-none-001-ref.xht
+pref(layout.css.column-span.enabled,true) fails == css-multicol/multicol-span-000.xht css-multicol/multicol-span-000-ref.xht
+pref(layout.css.column-span.enabled,true) == css-multicol/multicol-span-all-001.xht css-multicol/multicol-span-all-001-ref.xht
+pref(layout.css.column-span.enabled,true) == css-multicol/multicol-span-all-002.xht css-multicol/multicol-span-all-002-ref.xht
+pref(layout.css.column-span.enabled,true) fails-if(!OSX) random-if(OSX) == css-multicol/multicol-span-all-003.xht css-multicol/multicol-count-002-ref.xht
+pref(layout.css.column-span.enabled,true) fuzzy-if(winWidget,40-47,8-8) fuzzy-if(OSX,0-27,0-11) == css-multicol/multicol-span-all-block-sibling-003.xht css-multicol/multicol-span-all-block-sibling-3-ref.xht
+pref(layout.css.column-span.enabled,true) == css-multicol/multicol-span-all-margin-001.xht css-multicol/multicol-span-all-margin-001-ref.xht
+pref(layout.css.column-span.enabled,true) == css-multicol/multicol-span-all-margin-002.xht css-multicol/multicol-span-all-margin-002-ref.xht
+pref(layout.css.column-span.enabled,true) fails == css-multicol/multicol-span-all-margin-bottom-001.xht css-multicol/multicol-span-all-margin-bottom-001-ref.xht
+pref(layout.css.column-span.enabled,true) == css-multicol/multicol-span-all-margin-nested-001.xht css-multicol/multicol-span-all-margin-nested-001-ref.xht
+pref(layout.css.column-span.enabled,true) fails == css-multicol/multicol-span-all-margin-nested-002.xht css-multicol/multicol-span-all-margin-nested-001-ref.xht
+pref(layout.css.column-span.enabled,true) == css-multicol/multicol-span-all-margin-nested-firstchild-001.xht css-multicol/multicol-span-all-margin-nested-firstchild-ref.xht
+pref(layout.css.column-span.enabled,true) == css-multicol/multicol-span-float-001.xht css-multicol/multicol-span-float-001-ref.xht
+pref(layout.css.column-span.enabled,true) fails == css-multicol/multicol-span-none-001.xht css-multicol/multicol-span-none-001-ref.xht
 fails == css-multicol/multicol-table-cell-001.xht css-multicol/multicol-table-cell-001-ref.xht
 fails == css-multicol/multicol-table-cell-height-001.xht css-multicol/multicol-table-cell-height-001-ref.xht
 fails == css-multicol/multicol-table-cell-height-002.xht css-multicol/multicol-table-cell-height-001-ref.xht
 fails == css-multicol/multicol-table-cell-vertical-align-001.xht css-multicol/multicol-table-cell-vertical-align-ref.xht
 == css-multicol/multicol-width-001.xht css-multicol/multicol-width-001-ref.xht
 fuzzy(0-204,0-930) fuzzy-if(skiaContent,0-208,0-930) == css-multicol/multicol-width-002.xht css-multicol/multicol-width-002-ref.xht
 == css-multicol/multicol-width-003.xht css-multicol/multicol-width-002-ref.xht
 skip == css-multicol/multicol-width-ch-001.xht css-multicol/multicol-width-ch-ref.xht
--- a/testing/web-platform/meta/css/css-multicol/multicol-breaking-000.html.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-breaking-000.html.ini
@@ -1,2 +1,2 @@
 [multicol-breaking-000.html]
-  expected: FAIL
+  prefs: [layout.css.column-span.enabled:true]
--- a/testing/web-platform/meta/css/css-multicol/multicol-breaking-001.html.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-breaking-001.html.ini
@@ -1,2 +1,2 @@
 [multicol-breaking-001.html]
-  expected: FAIL
+  prefs: [layout.css.column-span.enabled:true]
--- a/testing/web-platform/meta/css/css-multicol/multicol-height-block-child-001.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-height-block-child-001.xht.ini
@@ -1,2 +1,2 @@
 [multicol-height-block-child-001.xht]
-  expected: FAIL
+  prefs: [layout.css.column-span.enabled:true]
--- a/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-bottom-001.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-bottom-001.xht.ini
@@ -1,2 +1,2 @@
 [multicol-span-all-margin-bottom-001.xht]
-  expected: FAIL
+  prefs: [layout.css.column-span.enabled:true]
--- a/testing/web-platform/meta/css/css-multicol/parsing/column-span-valid.html.ini
+++ b/testing/web-platform/meta/css/css-multicol/parsing/column-span-valid.html.ini
@@ -1,7 +1,2 @@
 [column-span-valid.html]
-  [e.style['column-span'\] = "none" should set the property value]
-    expected: FAIL
-
-  [e.style['column-span'\] = "all" should set the property value]
-    expected: FAIL
-
+  prefs: [layout.css.column-span.enabled:true]
--- a/testing/web-platform/meta/quirks/unitless-length/excluded-properties-002.html.ini
+++ b/testing/web-platform/meta/quirks/unitless-length/excluded-properties-002.html.ini
@@ -1,4 +1,2 @@
 [excluded-properties-002.html]
-  [Property column-span does not support quirky length]
-    expected: FAIL
-
+  prefs: [layout.css.column-span.enabled:true]