Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix block-direction border collapsing calculation

Browse source 
Previously the block-start collapsed borders from rows/cells were
written to `preliminary_collapsed_borders` but never read.  This fixes
the block-direction part of #14834.
This commit is contained in:
Matt Brubeck 2017-01-23 09:28:38 -08:00
parent e315e2e167
commit 258162fbee
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/layout/table.rs
View file

@ -681,13 +681,18 @@ fn perform_border_collapse_for_row(child_table_row: &mut TableRowFlow,
}
// Compute block-start borders.
match previous_block_borders {
PreviousBlockCollapsedBorders::FromPreviousRow(previous_block_borders) => {
child_table_row.final_collapsed_borders.block_start = previous_block_borders
}
PreviousBlockCollapsedBorders::FromTable(collapsed_border) => {
child_table_row.final_collapsed_borders.block_start =
vec![collapsed_border; child_table_row.block_flow.base.children.len()]
let block_start_borders = &mut child_table_row.final_collapsed_borders.block_start;
*block_start_borders = child_table_row.preliminary_collapsed_borders.block_start.clone();
for (i, this_border) in block_start_borders.iter_mut().enumerate() {
match previous_block_borders {
PreviousBlockCollapsedBorders::FromPreviousRow(ref previous_block_borders) => {
if previous_block_borders.len() > i {
this_border.combine(&previous_block_borders[i]);
}
}
PreviousBlockCollapsedBorders::FromTable(table_border) => {
this_border.combine(&table_border);
}
}
}

3
tests/wpt/metadata-css/css21_dev/html4/border-conflict-element-001c.htm.ini
View file

@ -1,3 +0,0 @@
[border-conflict-element-001c.htm]
type: reftest
expected: FAIL