From 577f1ea109e591c12b692511c8810ba7078be838 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Tue, 28 Apr 2015 13:16:01 -0700 Subject: [PATCH] layout: Don't panic in border collapse when a row has fewer cells than its previous sibling. This was seen in Twitter and the Google SERPs (sometimes). --- components/layout/table.rs | 4 +++- tests/ref/basic.list | 1 + tests/ref/border_collapse_missing_cell_a.html | 24 +++++++++++++++++++ .../ref/border_collapse_missing_cell_ref.html | 24 +++++++++++++++++++ 4 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 tests/ref/border_collapse_missing_cell_a.html create mode 100644 tests/ref/border_collapse_missing_cell_ref.html diff --git a/components/layout/table.rs b/components/layout/table.rs index 25d17d04b8f..fbc85d4a01f 100644 --- a/components/layout/table.rs +++ b/components/layout/table.rs @@ -754,7 +754,9 @@ fn perform_border_collapse_for_row(child_table_row: &mut TableRowFlow, let next_block = next_block.push_or_mutate(i, *this_block_border); match next_block_borders { NextBlockCollapsedBorders::FromNextRow(next_block_borders) => { - next_block.combine(&next_block_borders[i]); + if next_block_borders.len() > i { + next_block.combine(&next_block_borders[i]) + } } NextBlockCollapsedBorders::FromTable(ref next_block_borders) => { next_block.combine(next_block_borders); diff --git a/tests/ref/basic.list b/tests/ref/basic.list index 635d79798de..d9f16a71556 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -81,6 +81,7 @@ flaky_cpu == append_style_a.html append_style_b.html != border_black_ridge.html border_black_groove.html != border_black_ridge.html border_black_solid.html == border_code_tag.html border_code_tag_ref.html +== border_collapse_missing_cell_a.html border_collapse_missing_cell_ref.html == border_collapse_simple_a.html border_collapse_simple_ref.html == border_radius_clip_a.html border_radius_clip_ref.html == border_radius_overlapping_a.html border_radius_overlapping_ref.html diff --git a/tests/ref/border_collapse_missing_cell_a.html b/tests/ref/border_collapse_missing_cell_a.html new file mode 100644 index 00000000000..023ea8c541b --- /dev/null +++ b/tests/ref/border_collapse_missing_cell_a.html @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + +
United States40404(any)
3424486444Vodafone
+ + diff --git a/tests/ref/border_collapse_missing_cell_ref.html b/tests/ref/border_collapse_missing_cell_ref.html new file mode 100644 index 00000000000..023ea8c541b --- /dev/null +++ b/tests/ref/border_collapse_missing_cell_ref.html @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + +
United States40404(any)
3424486444Vodafone
+ +