RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 07:57:49 +00:00
Code Issues Activity Actions

LibWeb: Verify that table cells have a paintable when collecting them

Browse source 
Replicate the more conservative way it's done for other nodes, for
which we verify whether they have a paintable before doing
painting-related operations with it.

Fixes crash on https://www.haiku-os.org/.
This commit is contained in:
Andi Gallo 2023-08-09 21:15:11 +00:00 • committed by Andreas Kling
parent 670bbf24e5
commit 34cd7f4c22
3 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Tests/LibWeb/Layout/expected/table/table-cell-not-paintable.txt Normal file
View file

@ -0,0 +1,17 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x600 [BFC] children: not-inline
BlockContainer <body> at (8,8) content-size 784x17.46875 children: inline
line 0 width: 10, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from BlockContainer start: 0, length: 0, rect: [13,19 0x0]
BlockContainer <button> at (13,19) content-size 0x0 inline-block [BFC] children: inline
TextNode <#text>
TableWrapper <(anonymous)> (not painted) [BFC] children: not-inline
BlockContainer <(anonymous)> (not painted) table-box [TFC] children: not-inline
Box <(anonymous)> (not painted) table-row children: not-inline
BlockContainer <(anonymous)> (not painted) table-cell [BFC] children: not-inline
BlockContainer <(anonymous)> (not painted) inline-block [BFC] children: not-inline
PaintableWithLines (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
PaintableWithLines (BlockContainer<BUTTON>) [8,17 10x4]

2
Tests/LibWeb/Layout/input/table/table-cell-not-paintable.html Normal file
View file

@ -0,0 +1,2 @@
<button type="button">
</button>

5
Userland/Libraries/LibWeb/Painting/TableBordersPainting.cpp
View file

@ -34,8 +34,9 @@ static void collect_cell_boxes(Vector<PaintableBox const*>& cell_boxes, Layout::
{ {
box.for_each_child([&](auto& child) { box.for_each_child([&](auto& child) {
if (child.display().is_table_cell()) { if (child.display().is_table_cell()) {
VERIFY(is<Layout::Box>(child) && child.paintable()); VERIFY(is<Layout::Box>(child));
cell_boxes.append(static_cast<Layout::Box const&>(child).paintable_box()); if (child.paintable())
cell_boxes.append(static_cast<Layout::Box const&>(child).paintable_box());
} else { } else {
collect_cell_boxes(cell_boxes, child); collect_cell_boxes(cell_boxes, child);
} }