LibWeb: Set table wrapper width from the table box

Fixes #20385 and some Wikipedia pages, for example:
https://en.wikipedia.org/wiki/2022%E2%80%9323_UEFA_Champions_League_knockout_phase
This commit is contained in:
Andi Gallo 2023-08-16 08:18:07 +00:00 committed by Alexander Kalenik
parent f6dd512b65
commit 65854c3411
Notes: sideshowbarker 2024-07-17 05:58:46 +09:00
4 changed files with 77 additions and 2 deletions

View file

@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <body> at (8,8) content-size 784x600 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 784x0 children: inline
TextNode <#text>
TableWrapper <(anonymous)> at (8,8) content-size 784x600 [BFC] children: not-inline
TableWrapper <(anonymous)> at (8,8) content-size 1200x600 [BFC] children: not-inline
Box <div.aligncenter.block-image> at (8,8) content-size 1200x600 table-box [TFC] children: inline
Box <(anonymous)> at (8,8) content-size 1200x600 table-row children: inline
BlockContainer <(anonymous)> at (8,8) content-size 1200x600 table-cell [BFC] children: inline
@ -25,7 +25,7 @@ PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 1208x616]
PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x600] overflow: [8,8 1200x600]
PaintableWithLines (BlockContainer(anonymous)) [8,8 784x0]
PaintableWithLines (TableWrapper(anonymous)) [8,8 784x600] overflow: [8,8 1200x600]
PaintableWithLines (TableWrapper(anonymous)) [8,8 1200x600]
PaintableBox (Box<DIV>.aligncenter.block-image) [8,8 1200x600]
PaintableBox (Box(anonymous)) [8,8 1200x600]
PaintableWithLines (BlockContainer(anonymous)) [8,8 1200x600]

View file

@ -0,0 +1,50 @@
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 784x27.46875 children: not-inline
Box <div.grid> at (8,8) content-size 784x27.46875 [GFC] children: not-inline
BlockContainer <div> at (8,8) content-size 784x27.46875 [BFC] children: not-inline
BlockContainer <div.left> at (8,8) content-size 6.34375x17.46875 floating [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: [8,8 6.34375x17.46875]
"1"
TextNode <#text>
TableWrapper <(anonymous)> at (14.34375,8) content-size 156.796875x27.46875 floating [BFC] children: not-inline
Box <table.middle> at (15.34375,9) content-size 154.796875x25.46875 table-box [TFC] children: not-inline
Box <tbody> at (15.34375,9) content-size 148.796875x21.46875 table-row-group children: not-inline
Box <tr> at (17.34375,11) content-size 148.796875x21.46875 table-row children: not-inline
BlockContainer <td> at (19.34375,13) content-size 69.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: [19.34375,13 8.8125x17.46875]
"2"
TextNode <#text>
BlockContainer <td> at (94.9375,13) content-size 71.203125x17.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: [94.9375,13 9.09375x17.46875]
"3"
TextNode <#text>
BlockContainer <div.right> at (171.140625,8) content-size 7.75x17.46875 floating [BFC] children: inline
line 0 width: 7.75, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 1, rect: [171.140625,8 7.75x17.46875]
"4"
TextNode <#text>
BlockContainer <(anonymous)> at (8,35.46875) content-size 784x0 children: inline
TextNode <#text>
PaintableWithLines (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x27.46875]
PaintableBox (Box<DIV>.grid) [8,8 784x27.46875]
PaintableWithLines (BlockContainer<DIV>) [8,8 784x27.46875]
PaintableWithLines (BlockContainer<DIV>.left) [8,8 6.34375x17.46875]
TextPaintable (TextNode<#text>)
PaintableWithLines (TableWrapper(anonymous)) [14.34375,8 156.796875x27.46875]
PaintableBox (Box<TABLE>.middle) [14.34375,8 156.796875x27.46875]
PaintableBox (Box<TBODY>) [15.34375,9 148.796875x21.46875] overflow: [15.34375,9 152.796875x23.46875]
PaintableBox (Box<TR>) [17.34375,11 148.796875x21.46875] overflow: [17.34375,11 150.796875x21.46875]
PaintableWithLines (BlockContainer<TD>) [17.34375,11 73.59375x21.46875]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<TD>) [92.9375,11 75.203125x21.46875]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.right) [171.140625,8 7.75x17.46875]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer(anonymous)) [8,35.46875 784x0]

View file

@ -0,0 +1,23 @@
<style>
.grid {
display: grid;
}
.left {
float: left;
}
.middle {
float: left;
width: 20%;
}
.right {
float: left;
}
table,
td {
border: 1px solid black;
}
</style><div class="grid"><div><div class="left">1</div><table class="middle"><tr><td>2</td><td>3</td></tr></table><div class="right">4</div></div></div>

View file

@ -638,6 +638,8 @@ void TableFormattingContext::compute_table_width()
}
table_box_state.set_content_width(used_width);
auto& table_wrapper_box_state = m_state.get_mutable(table_wrapper());
table_wrapper_box_state.set_content_width(table_box_state.border_box_width());
}
CSSPixels TableFormattingContext::compute_columns_total_used_width() const