Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix table track offsets when there is visibility: collapse (#32469)

Browse source 
Each non-collapsed track used to increase the offset by the subsequent
border spacing. Now they will take care of their preceding spacing
instead.

This way, if a cell spans two rows, and the second is collapsed, the
cell won't be forced to be at least as tall as the border spacing.
This matches Gecko and Blink (WebKit lacks `visibility: collapse`).

This makes visibility-collapse-border-spacing-001.html fail because we
generate outlines in a different way than Blink. Gecko also fails it
in a similar (but different) way.
This commit is contained in:
Oriol Brufau 2024-06-11 20:59:09 +02:00 • committed by GitHub
parent 3c06536cb6
commit b4e41d8727
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 68 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1944,36 +1944,40 @@ impl TableAndTrackDimensions {
let fallback_block_size = table_layout.final_table_height;
let mut column_dimensions = Vec::new();
let mut column_offset = if table_layout.table.size.width == 0 {
fallback_inline_size
} else {
border_spacing.inline
};
let mut column_offset = Au::zero();
for column_index in 0..table_layout.table.size.width {
if table_layout.is_column_collapsed(column_index) {
column_dimensions.push((column_offset, column_offset));
continue;
}
let column_size = table_layout.distributed_column_widths[column_index];
column_dimensions.push((column_offset, column_offset + column_size));
column_offset += column_size + border_spacing.inline;
let start_offset = column_offset + border_spacing.inline;
let end_offset = start_offset + table_layout.distributed_column_widths[column_index];
column_dimensions.push((start_offset, end_offset));
column_offset = end_offset;
}
column_offset += if table_layout.table.size.width == 0 {
fallback_inline_size
} else {
border_spacing.inline
};
let mut row_dimensions = Vec::new();
let mut row_offset = if table_layout.table.size.height == 0 {
fallback_block_size
} else {
border_spacing.block
};
let mut row_offset = Au::zero();
for row_index in 0..table_layout.table.size.height {
if table_layout.is_row_collapsed(row_index) {
row_dimensions.push((row_offset, row_offset));
continue;
}
let row_size = table_layout.row_sizes[row_index];
row_dimensions.push((row_offset, row_offset + row_size));
row_offset += row_size + border_spacing.block;
let start_offset = row_offset + border_spacing.block;
let end_offset = start_offset + table_layout.row_sizes[row_index];
row_dimensions.push((start_offset, end_offset));
row_offset = end_offset;
}
row_offset += if table_layout.table.size.height == 0 {
fallback_block_size
} else {
border_spacing.block
};
let table_start_corner = LogicalVec2 {
inline: column_dimensions.first().map_or_else(Au::zero, |v| v.0),