tables: Add a naive implementation of border-collapse (#32309)

This change adds a very simple implementation of `border-collapse` for tables. No harmonization or merging is done at all for borders. Instead, the largest border for every continuous border sets the size. Instead of merging different border styles, they are squashed to half size -- which isn't great, but ensures appropriate positioning. Co-authored-by: Oriol Brufau <obrufau@igalia.com>
2025-08-07 22:45:34 +01:00 · 2024-05-18 10:24:23 +02:00 · 2024-05-18 10:24:23 +02:00 · 0cd9c3f2c4
commit 0cd9c3f2c4
parent 5cac276997
36 changed files with 126 additions and 285 deletions
--- a/tests/wpt/meta/css/CSS2/tables/border-collapse-no-interpolation.html.ini
+++ b/tests/wpt/meta/css/CSS2/tables/border-collapse-no-interpolation.html.ini
@ -8,60 +8,6 @@
  [CSS Transitions: property <border-collapse> from [initial\] to [collapse\] at (0.3) should be [initial\]]
    expected: FAIL

-  [CSS Transitions: property <border-collapse> from [initial\] to [collapse\] at (0.5) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions: property <border-collapse> from [initial\] to [collapse\] at (0.6) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions: property <border-collapse> from [initial\] to [collapse\] at (1) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions: property <border-collapse> from [initial\] to [collapse\] at (1.5) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <border-collapse> from [initial\] to [collapse\] at (-0.3) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <border-collapse> from [initial\] to [collapse\] at (0) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <border-collapse> from [initial\] to [collapse\] at (0.3) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <border-collapse> from [initial\] to [collapse\] at (0.5) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <border-collapse> from [initial\] to [collapse\] at (0.6) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <border-collapse> from [initial\] to [collapse\] at (1) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <border-collapse> from [initial\] to [collapse\] at (1.5) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Animations: property <border-collapse> from [initial\] to [collapse\] at (-0.3) should be [initial\]]
-    expected: FAIL
-
-  [CSS Animations: property <border-collapse> from [initial\] to [collapse\] at (0) should be [initial\]]
-    expected: FAIL
-
-  [CSS Animations: property <border-collapse> from [initial\] to [collapse\] at (0.3) should be [initial\]]
-    expected: FAIL
-
-  [CSS Animations: property <border-collapse> from [initial\] to [collapse\] at (0.5) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Animations: property <border-collapse> from [initial\] to [collapse\] at (0.6) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Animations: property <border-collapse> from [initial\] to [collapse\] at (1) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Animations: property <border-collapse> from [initial\] to [collapse\] at (1.5) should be [collapse\]]
-    expected: FAIL
-
  [Web Animations: property <border-collapse> from [initial\] to [collapse\] at (-0.3) should be [initial\]]
    expected: FAIL

@ -83,15 +29,6 @@
  [Web Animations: property <border-collapse> from [initial\] to [collapse\] at (1.5) should be [collapse\]]
    expected: FAIL

-  [CSS Transitions: property <border-collapse> from [initial\] to [collapse\] at (-0.3) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions: property <border-collapse> from [initial\] to [collapse\] at (0) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions: property <border-collapse> from [initial\] to [collapse\] at (0.3) should be [collapse\]]
-    expected: FAIL
-
  [CSS Transitions with transition-behavior:allow-discrete: property <border-collapse> from [initial\] to [collapse\] at (-0.3) should be [initial\]]
    expected: FAIL

@ -101,18 +38,6 @@
  [CSS Transitions with transition-behavior:allow-discrete: property <border-collapse> from [initial\] to [collapse\] at (0.3) should be [initial\]]
    expected: FAIL

-  [CSS Transitions with transition-behavior:allow-discrete: property <border-collapse> from [initial\] to [collapse\] at (0.5) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <border-collapse> from [initial\] to [collapse\] at (0.6) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <border-collapse> from [initial\] to [collapse\] at (1) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <border-collapse> from [initial\] to [collapse\] at (1.5) should be [collapse\]]
-    expected: FAIL
-
  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <border-collapse> from [initial\] to [collapse\] at (-0.3) should be [initial\]]
    expected: FAIL

@ -121,15 +46,3 @@

  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <border-collapse> from [initial\] to [collapse\] at (0.3) should be [initial\]]
    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <border-collapse> from [initial\] to [collapse\] at (0.5) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <border-collapse> from [initial\] to [collapse\] at (0.6) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <border-collapse> from [initial\] to [collapse\] at (1) should be [collapse\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <border-collapse> from [initial\] to [collapse\] at (1.5) should be [collapse\]]
-    expected: FAIL
--- a/tests/wpt/meta/css/CSS2/tables/border-collapse-offset-001.xht.ini
+++ b/tests/wpt/meta/css/CSS2/tables/border-collapse-offset-001.xht.ini
@ -1,2 +0,0 @@
-[border-collapse-offset-001.xht]
-  expected: FAIL
--- a/tests/wpt/meta/css/CSS2/tables/border-collapse-offset-002.xht.ini
+++ b/tests/wpt/meta/css/CSS2/tables/border-collapse-offset-002.xht.ini
@ -1,2 +0,0 @@
-[border-collapse-offset-002.xht]
-  expected: FAIL
--- a/tests/wpt/meta/css/CSS2/tables/collapsing-border-model-007.xht.ini
+++ b/tests/wpt/meta/css/CSS2/tables/collapsing-border-model-007.xht.ini
@ -1,2 +0,0 @@
-[collapsing-border-model-007.xht]
-  expected: FAIL
--- a/tests/wpt/meta/css/CSS2/tables/collapsing-border-model-008.xht.ini
+++ b/tests/wpt/meta/css/CSS2/tables/collapsing-border-model-008.xht.ini
@ -1,2 +0,0 @@
-[collapsing-border-model-008.xht]
-  expected: FAIL
--- a/tests/wpt/meta/css/CSS2/tables/collapsing-border-model-010a.xht.ini
+++ b/tests/wpt/meta/css/CSS2/tables/collapsing-border-model-010a.xht.ini
@ -1,2 +0,0 @@
-[collapsing-border-model-010a.xht]
-  expected: FAIL
--- a/tests/wpt/meta/css/CSS2/tables/collapsing-border-model-010b.xht.ini
+++ b/tests/wpt/meta/css/CSS2/tables/collapsing-border-model-010b.xht.ini
@ -1,2 +0,0 @@
-[collapsing-border-model-010b.xht]
-  expected: FAIL
--- a/tests/wpt/meta/css/CSS2/tables/table-visual-layout-017.xht.ini
+++ b/tests/wpt/meta/css/CSS2/tables/table-visual-layout-017.xht.ini
@ -1,2 +0,0 @@
-[table-visual-layout-017.xht]
-  expected: FAIL
--- a/tests/wpt/meta/css/CSS2/tables/table-visual-layout-018.xht.ini
+++ b/tests/wpt/meta/css/CSS2/tables/table-visual-layout-018.xht.ini
@ -1,2 +0,0 @@
-[table-visual-layout-018.xht]
-  expected: FAIL
--- a/tests/wpt/meta/css/CSS2/text/bidi-flag-emoji-02.html.ini
+++ b/tests/wpt/meta/css/CSS2/text/bidi-flag-emoji-02.html.ini
@ -1,2 +0,0 @@
-[bidi-flag-emoji-02.html]
-  expected: FAIL
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-parts.html.ini
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-table-parts.html.ini
@ -1,2 +0,0 @@
-[position-sticky-table-parts.html]
-  expected: FAIL
--- a/tests/wpt/meta/css/css-tables/background-clip-001.html.ini
+++ b/tests/wpt/meta/css/css-tables/background-clip-001.html.ini
@ -1,2 +0,0 @@
-[background-clip-001.html]
-  expected: FAIL
--- a/tests/wpt/meta/css/css-tables/fixed-layout-excess-width-distribution-001.html.ini
+++ b/tests/wpt/meta/css/css-tables/fixed-layout-excess-width-distribution-001.html.ini
@ -1,3 +0,0 @@
-[fixed-layout-excess-width-distribution-001.html]
-  [#theTable 1]
-    expected: FAIL
--- a/tests/wpt/meta/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-001.html.ini
+++ b/tests/wpt/meta/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-001.html.ini
@ -1,2 +0,0 @@
-[extra-height-given-to-all-row-groups-001.html]
-  expected: FAIL
--- a/tests/wpt/meta/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-002.html.ini
+++ b/tests/wpt/meta/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-002.html.ini
@ -1,2 +0,0 @@
-[extra-height-given-to-all-row-groups-002.html]
-  expected: FAIL
--- a/tests/wpt/meta/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-003.html.ini
+++ b/tests/wpt/meta/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-003.html.ini
@ -1,3 +0,0 @@
-[extra-height-given-to-all-row-groups-003.html]
-  [#theTable 1]
-    expected: FAIL
--- a/tests/wpt/meta/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-004.html.ini
+++ b/tests/wpt/meta/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-004.html.ini
@ -1,3 +0,0 @@
-[extra-height-given-to-all-row-groups-004.html]
-  [#theTable 1]
-    expected: FAIL
--- a/tests/wpt/meta/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-005.html.ini
+++ b/tests/wpt/meta/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-005.html.ini
@ -1,2 +0,0 @@
-[extra-height-given-to-all-row-groups-005.html]
-  expected: FAIL
--- a/tests/wpt/meta/css/css-tables/inheritance.html.ini
+++ b/tests/wpt/meta/css/css-tables/inheritance.html.ini
@ -1,10 +1,4 @@
 [inheritance.html]
-  [Property border-collapse has initial value separate]
-    expected: FAIL
-
-  [Property border-collapse inherits]
-    expected: FAIL
-
  [Property border-spacing has initial value 0px 0px]
    expected: FAIL

--- a/tests/wpt/meta/css/css-tables/internal-containing-block-001.html.ini
+++ b/tests/wpt/meta/css/css-tables/internal-containing-block-001.html.ini
@ -1,2 +0,0 @@
-[internal-containing-block-001.html]
-  expected: FAIL
--- a/tests/wpt/meta/css/css-tables/parsing/border-collapse-computed.html.ini
+++ b/tests/wpt/meta/css/css-tables/parsing/border-collapse-computed.html.ini
@ -1,6 +0,0 @@
-[border-collapse-computed.html]
-  [Property border-collapse value 'separate']
-    expected: FAIL
-
-  [Property border-collapse value 'collapse']
-    expected: FAIL
--- a/tests/wpt/meta/css/css-tables/parsing/border-collapse-valid.html.ini
+++ b/tests/wpt/meta/css/css-tables/parsing/border-collapse-valid.html.ini
@ -1,6 +0,0 @@
-[border-collapse-valid.html]
-  [e.style['border-collapse'\] = "separate" should set the property value]
-    expected: FAIL
-
-  [e.style['border-collapse'\] = "collapse" should set the property value]
-    expected: FAIL
--- a/tests/wpt/meta/css/css-tables/tentative/rowspan-height-redistribution.html.ini
+++ b/tests/wpt/meta/css/css-tables/tentative/rowspan-height-redistribution.html.ini
@ -1,7 +1,4 @@
 [rowspan-height-redistribution.html]
-  [table 7]
-    expected: FAIL
-
  [table 8]
    expected: FAIL

@ -10,57 +7,3 @@

  [table 23]
    expected: FAIL
-
-  [table 2]
-    expected: FAIL
-
-  [table 3]
-    expected: FAIL
-
-  [table 4]
-    expected: FAIL
-
-  [table 5]
-    expected: FAIL
-
-  [table 6]
-    expected: FAIL
-
-  [table 9]
-    expected: FAIL
-
-  [table 10]
-    expected: FAIL
-
-  [table 11]
-    expected: FAIL
-
-  [table 12]
-    expected: FAIL
-
-  [table 13]
-    expected: FAIL
-
-  [table 14]
-    expected: FAIL
-
-  [table 15]
-    expected: FAIL
-
-  [table 16]
-    expected: FAIL
-
-  [table 17]
-    expected: FAIL
-
-  [table 18]
-    expected: FAIL
-
-  [table 20]
-    expected: FAIL
-
-  [table 21]
-    expected: FAIL
-
-  [table 24]
-    expected: FAIL
--- a/tests/wpt/meta/css/css-tables/visibility-collapse-col-005.html.ini
+++ b/tests/wpt/meta/css/css-tables/visibility-collapse-col-005.html.ini
@ -1,6 +1,3 @@
 [visibility-collapse-col-005.html]
  [col visibility:collapse changes table width]
    expected: FAIL
-
-  [col visibility:collapse doesn't change table height]
-    expected: FAIL
--- a/tests/wpt/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-004.html.ini
+++ b/tests/wpt/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-004.html.ini
@ -1,2 +0,0 @@
-[overflow-wrap-min-content-size-004.html]
-  expected: FAIL
--- a/tests/wpt/meta/css/cssom/serialize-values.html.ini
+++ b/tests/wpt/meta/css/cssom/serialize-values.html.ini
@ -83,15 +83,6 @@
  [list-style-type: lower-roman]
    expected: FAIL

-  [border-collapse: collapse]
-    expected: FAIL
-
-  [border-collapse: separate]
-    expected: FAIL
-
-  [border-collapse: inherit]
-    expected: FAIL
-
  [caption-side: top]
    expected: FAIL

--- a/tests/wpt/meta/html/rendering/non-replaced-elements/tables/table-cell-width-s.html.ini
+++ b/tests/wpt/meta/html/rendering/non-replaced-elements/tables/table-cell-width-s.html.ini
@ -1,2 +0,0 @@
-[table-cell-width-s.html]
-  expected: FAIL
--- a/tests/wpt/meta/html/rendering/non-replaced-elements/tables/table-cell-width.html.ini
+++ b/tests/wpt/meta/html/rendering/non-replaced-elements/tables/table-cell-width.html.ini
@ -1,2 +0,0 @@
-[table-cell-width.html]
-  expected: FAIL
--- a/tests/wpt/meta/html/rendering/non-replaced-elements/tables/table-width-s.html.ini
+++ b/tests/wpt/meta/html/rendering/non-replaced-elements/tables/table-width-s.html.ini
@ -1,2 +0,0 @@
-[table-width-s.html]
-  expected: FAIL
--- a/tests/wpt/meta/html/rendering/non-replaced-elements/tables/table-width.html.ini
+++ b/tests/wpt/meta/html/rendering/non-replaced-elements/tables/table-width.html.ini
@ -1,2 +0,0 @@
-[table-width.html]
-  expected: FAIL
--- a/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-sans-fieldset-display.html.ini
+++ b/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-sans-fieldset-display.html.ini
@ -4,18 +4,3 @@

  [.rt]
    expected: FAIL
-
-  [.table]
-    expected: FAIL
-
-  [.col]
-    expected: FAIL
-
-  [.tbody]
-    expected: FAIL
-
-  [.tr]
-    expected: FAIL
-
-  [.td]
-    expected: FAIL
--- a/tests/wpt/mozilla/meta/css/display_table_cell_intrinsic_width_a.html.ini
+++ b/tests/wpt/mozilla/meta/css/display_table_cell_intrinsic_width_a.html.ini
@ -1,2 +0,0 @@
-[display_table_cell_intrinsic_width_a.html]
-  expected: FAIL
--- a/tests/wpt/mozilla/meta/gfx-rs-gecko/356774-1.html.ini
+++ b/tests/wpt/mozilla/meta/gfx-rs-gecko/356774-1.html.ini
@ -1,2 +0,0 @@
-[356774-1.html]
-  expected: FAIL