layout2020 (flexbox): Implement start, end, and space-evenly content alignment (#31724)

* Upgrade to stylo 6faedad * Implement start, end, space-evenly content alignment + fix others Update test expectations for content alignment fixes Revert test expectations that are still generating the old results in CI Update layout2013 test expectation for content alignment Update content alignment fallback to use safe alignment Implement fallback alignment Update content alignment with recent spec changes
2025-08-06 22:15:33 +01:00 · 2024-04-29 11:17:11 +12:00 · 2024-04-29 11:17:11 +12:00 · 1d6be62454
commit 1d6be62454
parent 02b3dd0b61
26 changed files with 179 additions and 219 deletions
--- a/tests/wpt/meta-legacy-layout/css/css-align/content-distribution/parse-align-content-001.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-align/content-distribution/parse-align-content-001.html.ini
@ -14,24 +14,14 @@
  [Checking align-content: last baseline]
    expected: FAIL

-  [Checking align-content: start]
-    expected: FAIL
-
  [Checking align-content: unsafe flex-start]
    expected: FAIL

  [Checking align-content: unsafe end]
    expected: FAIL

-  [Checking align-content: end]
-    expected: FAIL
-
-  [Checking align-content: space-evenly]
-    expected: FAIL
-
  [Checking align-content: safe center]
    expected: FAIL

  [Checking align-content: normal]
    expected: FAIL
-
--- a/tests/wpt/meta-legacy-layout/css/css-align/content-distribution/parse-align-content-003.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-align/content-distribution/parse-align-content-003.html.ini
@ -14,24 +14,14 @@
  [Checking align-content: last baseline]
    expected: FAIL

-  [Checking align-content: start]
-    expected: FAIL
-
  [Checking align-content: unsafe flex-start]
    expected: FAIL

  [Checking align-content: unsafe end]
    expected: FAIL

-  [Checking align-content: end]
-    expected: FAIL
-
-  [Checking align-content: space-evenly]
-    expected: FAIL
-
  [Checking align-content: safe center]
    expected: FAIL

  [Checking align-content: normal]
    expected: FAIL
-
--- a/tests/wpt/meta-legacy-layout/css/css-align/content-distribution/parse-align-content-005.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-align/content-distribution/parse-align-content-005.html.ini
@ -1,10 +1,6 @@
 [parse-align-content-005.html]
-  [Test the value 'inherit' overrides current value ('end')]
-    expected: FAIL
-
  [Test the value 'inherit' overrides current value ('unsafe center')]
    expected: FAIL

  [Test the value 'inherit' overrides current value ('safe start')]
    expected: FAIL
-
--- a/tests/wpt/meta-legacy-layout/css/css-align/content-distribution/parse-justify-content-001.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-align/content-distribution/parse-justify-content-001.html.ini
@ -1,13 +1,7 @@
 [parse-justify-content-001.html]
-  [Checking justify-content: start]
-    expected: FAIL
-
  [Checking justify-content: safe center]
    expected: FAIL

-  [Checking justify-content: end]
-    expected: FAIL
-
  [Checking justify-content: left]
    expected: FAIL

@ -20,9 +14,6 @@
  [Checking justify-content: safe end]
    expected: FAIL

-  [Checking justify-content: space-evenly]
-    expected: FAIL
-
  [Checking justify-content: safe flex-end]
    expected: FAIL

@ -31,4 +22,3 @@

  [Checking justify-content: unsafe end]
    expected: FAIL
-
--- a/tests/wpt/meta-legacy-layout/css/css-align/content-distribution/parse-justify-content-003.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-align/content-distribution/parse-justify-content-003.html.ini
@ -1,13 +1,7 @@
 [parse-justify-content-003.html]
-  [Checking justify-content: start]
-    expected: FAIL
-
  [Checking justify-content: safe center]
    expected: FAIL

-  [Checking justify-content: end]
-    expected: FAIL
-
  [Checking justify-content: left]
    expected: FAIL

@ -20,9 +14,6 @@
  [Checking justify-content: safe end]
    expected: FAIL

-  [Checking justify-content: space-evenly]
-    expected: FAIL
-
  [Checking justify-content: safe flex-end]
    expected: FAIL

@ -31,4 +22,3 @@

  [Checking justify-content: unsafe end]
    expected: FAIL
-
--- a/tests/wpt/meta-legacy-layout/css/css-align/content-distribution/parse-justify-content-005.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-align/content-distribution/parse-justify-content-005.html.ini
@ -1,10 +1,6 @@
 [parse-justify-content-005.html]
-  [Test the value 'inherit' overrides current value ('end')]
-    expected: FAIL
-
  [Test the value 'inherit' overrides current value ('safe left')]
    expected: FAIL

  [Test the value 'inherit' overrides current value ('unsafe center')]
    expected: FAIL
-
--- a/tests/wpt/meta-legacy-layout/css/css-align/content-distribution/place-content-shorthand-004.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-align/content-distribution/place-content-shorthand-004.html.ini
@ -1,22 +0,0 @@
-[place-content-shorthand-004.html]
-  [Verify fallback values are invalid]
-    expected: FAIL
-
-  [Verify numeric values are invalid]
-    expected: FAIL
-
-  [Verify 'auto' values are invalid]
-    expected: FAIL
-
-  [Verify self-position values are invalid]
-    expected: FAIL
-
-  [Verify <baseline-position> values are invalid for the justify-content property]
-    expected: FAIL
-
-  [Verify empty declaration is invalid]
-    expected: FAIL
-
-  [Verify 'left' and 'right' values are invalid for block/cross axis alignment]
-    expected: FAIL
-
--- a/tests/wpt/meta-legacy-layout/css/css-align/inheritance.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-align/inheritance.html.ini
@ -17,9 +17,6 @@
  [Property justify-content has initial value normal]
    expected: FAIL

-  [Property justify-content does not inherit]
-    expected: FAIL
-
  [Property align-content does not inherit]
    expected: FAIL

@ -46,4 +43,3 @@

  [Property column-gap does not inherit]
    expected: FAIL
-
--- a/tests/wpt/meta-legacy-layout/css/css-align/parsing/align-content-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-align/parsing/align-content-computed.html.ini
@ -35,15 +35,5 @@
  [Property align-content value 'normal']
    expected: FAIL

-  [Property align-content value 'space-evenly']
-    expected: FAIL
-
  [Property align-content value 'safe flex-start']
    expected: FAIL
-
-  [Property align-content value 'start']
-    expected: FAIL
-
-  [Property align-content value 'end']
-    expected: FAIL
-
--- a/tests/wpt/meta-legacy-layout/css/css-align/parsing/align-content-valid.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-align/parsing/align-content-valid.html.ini
@ -5,24 +5,14 @@
  [e.style['align-content'\] = "unsafe end" should set the property value]
    expected: FAIL

-  [e.style['align-content'\] = "end" should set the property value]
-    expected: FAIL
-
  [e.style['align-content'\] = "normal" should set the property value]
    expected: FAIL

  [e.style['align-content'\] = "baseline" should set the property value]
    expected: FAIL

-  [e.style['align-content'\] = "space-evenly" should set the property value]
-    expected: FAIL
-
-  [e.style['align-content'\] = "start" should set the property value]
-    expected: FAIL
-
  [e.style['align-content'\] = "safe flex-start" should set the property value]
    expected: FAIL

  [e.style['align-content'\] = "last baseline" should set the property value]
    expected: FAIL
-
--- a/tests/wpt/meta-legacy-layout/css/css-align/parsing/justify-content-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-align/parsing/justify-content-computed.html.ini
@ -23,12 +23,6 @@
  [Property justify-content value 'safe flex-start' computes to 'safe flex-start']
    expected: FAIL

-  [Property justify-content value 'start']
-    expected: FAIL
-
-  [Property justify-content value 'end']
-    expected: FAIL
-
  [Property justify-content value 'unsafe end']
    expected: FAIL

@ -41,9 +35,5 @@
  [Property justify-content value 'safe flex-start']
    expected: FAIL

-  [Property justify-content value 'space-evenly']
-    expected: FAIL
-
  [Property justify-content value 'left']
    expected: FAIL
-
--- a/tests/wpt/meta-legacy-layout/css/css-align/parsing/justify-content-valid.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-align/parsing/justify-content-valid.html.ini
@ -2,24 +2,14 @@
  [e.style['justify-content'\] = "unsafe right" should set the property value]
    expected: FAIL

-  [e.style['justify-content'\] = "start" should set the property value]
-    expected: FAIL
-
  [e.style['justify-content'\] = "normal" should set the property value]
    expected: FAIL

  [e.style['justify-content'\] = "unsafe end" should set the property value]
    expected: FAIL

-  [e.style['justify-content'\] = "space-evenly" should set the property value]
-    expected: FAIL
-
-  [e.style['justify-content'\] = "end" should set the property value]
-    expected: FAIL
-
  [e.style['justify-content'\] = "safe flex-start" should set the property value]
    expected: FAIL

  [e.style['justify-content'\] = "left" should set the property value]
    expected: FAIL
-
--- a/tests/wpt/meta-legacy-layout/css/css-flexbox/align-content-wrap-005.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-flexbox/align-content-wrap-005.html.ini
@ -5,9 +5,6 @@
  [.flexitem 2]
    expected: FAIL

-  [.flexitem 4]
-    expected: FAIL
-
  [.flexitem 5]
    expected: FAIL

--- a/tests/wpt/meta/css/css-flexbox/align-content-wrap-001.html.ini
+++ b/tests/wpt/meta/css/css-flexbox/align-content-wrap-001.html.ini
@ -7,15 +7,3 @@

  [.default, .verticalWriting 9]
    expected: FAIL
-
-  [.default, .verticalWriting 5]
-    expected: FAIL
-
-  [.default, .verticalWriting 6]
-    expected: FAIL
-
-  [.default, .verticalWriting 3]
-    expected: FAIL
-
-  [.default, .verticalWriting 2]
-    expected: FAIL
--- a/tests/wpt/meta/css/css-flexbox/align-content-wrap-003.html.ini
+++ b/tests/wpt/meta/css/css-flexbox/align-content-wrap-003.html.ini
@ -1,7 +1,4 @@
 [align-content-wrap-003.html]
-  [.flexbox 6]
-    expected: FAIL
-
  [.flexbox 1]
    expected: FAIL

@ -11,12 +8,6 @@
  [.flexbox 8]
    expected: FAIL

-  [.flexbox 12]
-    expected: FAIL
-
-  [.flexbox 11]
-    expected: FAIL
-
  [.flexbox 34]
    expected: FAIL

@ -59,12 +50,6 @@
  [.flexbox 22]
    expected: FAIL

-  [.flexbox 21]
-    expected: FAIL
-
-  [.flexbox 20]
-    expected: FAIL
-
  [.flexbox 44]
    expected: FAIL

--- a/tests/wpt/meta/css/css-flexbox/align-content-wrap-005.html.ini
+++ b/tests/wpt/meta/css/css-flexbox/align-content-wrap-005.html.ini
@ -5,6 +5,12 @@
  [.flexitem 2]
    expected: FAIL

+  [.flexitem 3]
+    expected: FAIL
+
+  [.flexitem 4]
+    expected: FAIL
+
  [.flexitem 5]
    expected: FAIL

--- a/tests/wpt/meta/css/css-flexbox/flexbox-justify-content-horiz-002.xhtml.ini
+++ b/tests/wpt/meta/css/css-flexbox/flexbox-justify-content-horiz-002.xhtml.ini
@ -1,2 +0,0 @@
-[flexbox-justify-content-horiz-002.xhtml]
-  expected: FAIL
--- a/tests/wpt/meta/css/css-flexbox/flexbox-justify-content-horiz-004.xhtml.ini
+++ b/tests/wpt/meta/css/css-flexbox/flexbox-justify-content-horiz-004.xhtml.ini
@ -1,2 +0,0 @@
-[flexbox-justify-content-horiz-004.xhtml]
-  expected: FAIL
--- a/tests/wpt/meta/css/css-flexbox/flexbox_justifycontent-rtl-001.html.ini
+++ b/tests/wpt/meta/css/css-flexbox/flexbox_justifycontent-rtl-001.html.ini
@ -5,15 +5,15 @@
  [.container > div 2]
    expected: FAIL

-  [.container > div 4]
-    expected: FAIL
-
  [.container > div 5]
    expected: FAIL

  [.container > div 7]
    expected: FAIL

+  [.container > div 8]
+    expected: FAIL
+
  [.container > div 9]
    expected: FAIL

--- a/tests/wpt/meta/css/css-flexbox/flexbox_justifycontent-spacearound-negative.html.ini
+++ b/tests/wpt/meta/css/css-flexbox/flexbox_justifycontent-spacearound-negative.html.ini
@ -1,2 +0,0 @@
-[flexbox_justifycontent-spacearound-negative.html]
-  expected: FAIL
--- a/tests/wpt/meta/css/css-flexbox/flexbox_justifycontent-spacebetween-negative.html.ini
+++ b/tests/wpt/meta/css/css-flexbox/flexbox_justifycontent-spacebetween-negative.html.ini
@ -1,2 +0,0 @@
-[flexbox_justifycontent-spacebetween-negative.html]
-  expected: FAIL
--- a/tests/wpt/meta/css/css-flexbox/flexbox_justifycontent-start-rtl.html.ini
+++ b/tests/wpt/meta/css/css-flexbox/flexbox_justifycontent-start-rtl.html.ini
@ -1,2 +0,0 @@
-[flexbox_justifycontent-start-rtl.html]
-  expected: FAIL
--- a/tests/wpt/meta/css/css-flexbox/flexbox_justifycontent-start.html.ini
+++ b/tests/wpt/meta/css/css-flexbox/flexbox_justifycontent-start.html.ini
@ -1,2 +0,0 @@
-[flexbox_justifycontent-start.html]
-  expected: FAIL