RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 11:42:45 +00:00
Code Issues Activity Actions

LibWeb: Fix intrinsic sizing early return condition in TFC

Browse source 
Early return before running full TFC algorithm is only possible when
just table width need to be calculated.
This commit is contained in:
Aliaksandr Kalenik 2023-03-27 19:06:21 +03:00 • committed by Andreas Kling
parent 97b3f1230b
commit 1ee99017e2
3 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Tests/LibWeb/Layout/expected/table-in-auto-height-flex-item.txt Normal file
View file

@ -0,0 +1,12 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (1,1) content-size 798x39.46875 children: not-inline
Box <body> at (10,10) content-size 764x21.46875 flex-container(row) children: not-inline
BlockContainer <div.upper> at (11,11) content-size 41.78125x19.46875 flex-item children: not-inline
TableWrapper <(anonymous)> at (11,11) content-size 41.78125x19.46875 children: not-inline
TableBox <(anonymous)> at (11,11) content-size 41.78125x19.46875 children: not-inline
TableRowBox <(anonymous)> at (11,11) content-size 41.78125x19.46875 children: not-inline
TableCellBox <div.cell> at (12,12) content-size 39.78125x17.46875 children: inline
line 0 width: 39.78125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 5, rect: [12,12 39.78125x17.46875]
"Hello"
TextNode <#text>

15
Tests/LibWeb/Layout/input/table-in-auto-height-flex-item.html Normal file
View file

@ -0,0 +1,15 @@
<!DOCTYPE html><html><head><style>
* {
border: 1px solid black;
font-family: 'SerenitySans';
}
body {
display: flex;
}
.cell {
display: table-cell;
}
.upper {
background: pink;
}
</style></head><body><div class="upper"><div class="cell">Hello</div>

2
Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp
View file

@ -521,7 +521,7 @@ void TableFormattingContext::run(Box const& box, LayoutMode layout_mode, Availab
// Compute the minimum width of each column.
compute_table_measures();
if (available_space.width.is_intrinsic_sizing_constraint()) {
if (available_space.width.is_intrinsic_sizing_constraint() && !available_space.height.is_intrinsic_sizing_constraint()) {
determine_intrisic_size_of_table_container(available_space);
return;
}