Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't shrink table columns when handling cells with greater spanning (#32458)

Browse source 
For example:
```html
<table border="1">
  <tr>  <td></td>  <td></td>  </tr>
  <tr>  <td colspan="2"></td>  </tr>
</table>
```
We should initially size the columns according to the cells in the first
row since they have a span of 1. Then we handle the cell in the second
row with a span of 2, this should be able to increase the size of the
columns, but never decrease them.
This commit is contained in:
Oriol Brufau 2024-06-07 18:37:12 +02:00 • committed by GitHub
parent 674edb4df0
commit d10d01757d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 2 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/layout_2020/table/layout.rs
View file

@ -433,8 +433,8 @@ impl<'a> TableLayout<'a> {
for column_index in 0..self.table.size.width {
let old_column_measure = &old_column_measures[column_index];
let mut new_column_content_sizes = ContentSizes::zero();
let mut new_column_intrinsic_percentage_width = Percentage(0.);
let mut new_column_content_sizes = old_column_measure.content_sizes;
let mut new_column_intrinsic_percentage_width = old_column_measure.percentage;
for row_index in 0..self.table.size.height {
let coords = TableSlotCoordinates::new(column_index, row_index);

2
tests/wpt/meta/css/CSS2/floats-clear/margin-collapse-121.xht.ini
View file

@ -1,2 +0,0 @@
[margin-collapse-121.xht]
expected: FAIL

2
tests/wpt/meta/css/CSS2/floats-clear/margin-collapse-122.xht.ini
View file

@ -1,2 +0,0 @@
[margin-collapse-122.xht]
expected: FAIL

2
tests/wpt/meta/css/CSS2/floats-clear/margin-collapse-123.xht.ini
View file

@ -1,2 +0,0 @@
[margin-collapse-123.xht]
expected: FAIL

2
tests/wpt/meta/css/CSS2/floats-clear/margin-collapse-125.xht.ini
View file

@ -1,2 +0,0 @@
[margin-collapse-125.xht]
expected: FAIL

2
tests/wpt/meta/css/CSS2/floats-clear/margin-collapse-158.xht.ini
View file

@ -1,2 +0,0 @@
[margin-collapse-158.xht]
expected: FAIL

2
tests/wpt/meta/css/css-color/hsl-clamp-negative-saturation.html.ini
View file

@ -1,2 +0,0 @@
[hsl-clamp-negative-saturation.html]
expected: FAIL

2
tests/wpt/meta/css/css-color/hsla-clamp-negative-saturation.html.ini
View file

@ -1,2 +0,0 @@
[hsla-clamp-negative-saturation.html]
expected: FAIL

2
tests/wpt/meta/css/css-color/t421-rgb-clip-outside-gamut-b.xht.ini
View file

@ -1,2 +0,0 @@
[t421-rgb-clip-outside-gamut-b.xht]
expected: FAIL

2
tests/wpt/meta/css/css-color/t422-rgba-clip-outside-device-gamut-b.xht.ini
View file

@ -1,2 +0,0 @@
[t422-rgba-clip-outside-device-gamut-b.xht]
expected: FAIL

2
tests/wpt/meta/css/css-tables/colspan-004.html.ini
View file

@ -1,2 +0,0 @@
[colspan-004.html]
expected: FAIL

3
tests/wpt/meta/css/css-tables/column-track-merging.html.ini
View file

@ -22,6 +22,3 @@
[main table 3]
expected: FAIL
[main table 2]
expected: FAIL

3
tests/wpt/meta/css/css-tables/dynamic-rowspan-change.html.ini
View file

@ -1,3 +0,0 @@
[dynamic-rowspan-change.html]
[main table 2]
expected: FAIL

3
tests/wpt/meta/css/css-tables/height-distribution/computing-row-measure-1.html.ini
View file

@ -4,6 +4,3 @@
[Checking intermediate min-content width for span 2 (1)]
expected: FAIL
[Checking intermediate min-content width for span 2 (2)]
expected: FAIL

3
tests/wpt/meta/css/css-tables/tentative/colspan-redistribution.html.ini
View file

@ -79,6 +79,3 @@
[table 8]
expected: FAIL
[table 7]
expected: FAIL

2
tests/wpt/meta/css/css-tables/tentative/paint/background-image-column.html.ini
View file

@ -1,2 +0,0 @@
[background-image-column.html]
expected: FAIL

2
tests/wpt/meta/css/css-tables/tentative/paint/background-image-row.html.ini
View file

@ -1,2 +0,0 @@
[background-image-row.html]
expected: FAIL

3
tests/wpt/meta/css/css-tables/visibility-collapse-rowcol-001.html.ini
View file

@ -1,3 +0,0 @@
[visibility-collapse-rowcol-001.html]
[spanning col visibility:collapse changes table width]
expected: FAIL

2
tests/wpt/mozilla/meta/css/table_colspan_simple_a.html.ini
View file

@ -1,2 +0,0 @@
[table_colspan_simple_a.html]
expected: FAIL

2
tests/wpt/mozilla/meta/css/table_colspan_spacing_a.html.ini
View file

@ -1,2 +0,0 @@
[table_colspan_spacing_a.html]
expected: FAIL