diff --git a/Tests/LibWeb/Layout/expected/table/table-formation-with-rowspan-in-the-middle.txt b/Tests/LibWeb/Layout/expected/table/table-formation-with-rowspan-in-the-middle.txt new file mode 100644 index 0000000000..d8680702aa --- /dev/null +++ b/Tests/LibWeb/Layout/expected/table/table-formation-with-rowspan-in-the-middle.txt @@ -0,0 +1,86 @@ +Viewport <#document> at (0,0) content-size 800x600 children: not-inline + BlockContainer at (0,0) content-size 800x600 [BFC] children: not-inline + BlockContainer at (8,8) content-size 784x159.875 children: not-inline + TableWrapper <(anonymous)> at (8,8) content-size 99.421875x159.875 [BFC] children: not-inline + Box at (9,9) content-size 99.421875x157.875 table-box [TFC] children: not-inline + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + Box at (9,9) content-size 101.421875x157.875 table-row-group children: not-inline + Box at (9,9) content-size 101.421875x39.46875 table-row children: not-inline + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + BlockContainer at (9,48.46875) content-size 101.421875x39.46875 table-row children: not-inline + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + BlockContainer at (9,87.9375) content-size 101.421875x39.46875 table-row children: not-inline + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + BlockContainer at (9,127.40625) content-size 101.421875x39.46875 table-row children: not-inline + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + BlockContainer
at (20,20) content-size 9.59375x17.46875 table-cell [BFC] children: inline + line 0 width: 9.59375, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 1, rect: [20,20 9.59375x17.46875] + "0" + TextNode <#text> + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + BlockContainer at (51.59375,39.734375) content-size 14.265625x17.46875 table-cell [BFC] children: inline + line 0 width: 14.265625, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 1, rect: [51.59375,39.734375 14.265625x17.46875] + "A" + TextNode <#text> + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + BlockContainer at (87.859375,59.46875) content-size 11.5625x17.46875 table-cell [BFC] children: inline + line 0 width: 11.5625, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 1, rect: [87.859375,59.46875 11.5625x17.46875] + "X" + TextNode <#text> + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + Box
at (20,59.46875) content-size 9.59375x17.46875 table-cell [BFC] children: inline + line 0 width: 6.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 1, rect: [20,59.46875 6.34375x17.46875] + "1" + TextNode <#text> + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + Box
at (20,98.9375) content-size 9.59375x17.46875 table-cell [BFC] children: inline + line 0 width: 8.8125, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 1, rect: [20,98.9375 8.8125x17.46875] + "2" + TextNode <#text> + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + BlockContainer at (51.59375,118.671875) content-size 14.265625x17.46875 table-cell [BFC] children: inline + line 0 width: 9.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 1, rect: [51.59375,118.671875 9.34375x17.46875] + "B" + TextNode <#text> + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + Box
at (20,138.40625) content-size 9.59375x17.46875 table-cell [BFC] children: inline + line 0 width: 9.09375, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 1, rect: [20,138.40625 9.09375x17.46875] + "3" + TextNode <#text> + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + BlockContainer at (87.859375,138.40625) content-size 11.5625x17.46875 table-cell [BFC] children: inline + line 0 width: 10.3125, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 1, rect: [87.859375,138.40625 10.3125x17.46875] + "C" + TextNode <#text> + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + BlockContainer <(anonymous)> (not painted) children: inline + TextNode <#text> + BlockContainer <(anonymous)> at (8,167.875) content-size 784x0 children: inline + TextNode <#text> diff --git a/Tests/LibWeb/Layout/input/table/table-formation-with-rowspan-in-the-middle.html b/Tests/LibWeb/Layout/input/table/table-formation-with-rowspan-in-the-middle.html new file mode 100644 index 0000000000..e46753c7a3 --- /dev/null +++ b/Tests/LibWeb/Layout/input/table/table-formation-with-rowspan-in-the-middle.html @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + +
0AX
1
2B
3C
diff --git a/Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp index 7e96cc8363..7bc0887a7d 100644 --- a/Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp @@ -98,16 +98,19 @@ void TableFormattingContext::calculate_row_column_grid(Box const& box) size_t x_width = 0, y_height = 0; size_t x_current = 0, y_current = 0; + // Implements https://html.spec.whatwg.org/multipage/tables.html#algorithm-for-processing-rows auto process_row = [&](auto& row) { if (y_height == y_current) y_height++; x_current = 0; - while (x_current < x_width && grid.contains(GridPosition { x_current, y_current })) - x_current++; for (auto* child = row.first_child(); child; child = child->next_sibling()) { if (child->display().is_table_cell()) { + // Cells: While x_current is less than x_width and the slot with coordinate (x_current, y_current) already has a cell assigned to it, increase x_current by 1. + while (x_current < x_width && grid.contains(GridPosition { x_current, y_current })) + x_current++; + Box const* box = static_cast(child); if (x_current == x_width) x_width++;