mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-25 19:56:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibWeb: Account for natural aspect ratio in calculate_min_content_height

Browse source 
By the time we calculate the min-content height, the width is already
known, so we can use it to calculate the height based on the natural
aspect ratio.
This commit is contained in:
Aliaksandr Kalenik 2025-07-08 20:10:51 +02:00 • committed by Alexander Kalenik
commit 8d9920af16
Notes: github-actions[bot] 2025-07-08 20:36:08 +00:00
4 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Libraries/LibWeb/Layout/FormattingContext.cpp
View file

@ -1513,8 +1513,11 @@ CSSPixels FormattingContext::calculate_min_content_height(Layout::Box const& box
if (box.is_block_container() || box.display().is_table_inside()) if (box.is_block_container() || box.display().is_table_inside())
return calculate_max_content_height(box, width); return calculate_max_content_height(box, width);
if (box.has_natural_height()) if (box.has_natural_height()) {
if (box.has_natural_aspect_ratio())
return width / *box.natural_aspect_ratio();
return *box.natural_height(); return *box.natural_height();
}
auto& cache = box.cached_intrinsic_sizes().min_content_height.ensure(width); auto& cache = box.cached_intrinsic_sizes().min_content_height.ensure(width);
if (cache.has_value()) if (cache.has_value())

9
Tests/LibWeb/Layout/expected/grid/img-with-percentage-width-and-height.txt Normal file
View file

@ -0,0 +1,9 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x66 [BFC] children: not-inline
Box <body> at (8,8) content-size 50x50 [GFC] children: not-inline
ImageBox <img> at (8,8) content-size 50x50 children: not-inline
ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x66]
PaintableBox (Box<BODY>) [8,8 50x50]
ImagePaintable (ImageBox<IMG>) [8,8 50x50]

12
Tests/LibWeb/Layout/input/grid/img-with-percentage-width-and-height.html Normal file
View file

@ -0,0 +1,12 @@
<!doctype html><style>
body {
display: grid;
width: 50px;
height: 50px;
}
img {
grid-area: 1 / 1;
height: 100%;
width: 100%;
}
</style><body><img src="../../../Assets/120.png">

8
Tests/LibWeb/Text/expected/wpt-import/css/css-flexbox/flex-aspect-ratio-img-column-011.txt
View file

@ -2,15 +2,15 @@ Harness status: OK
Found 10 tests Found 10 tests
7 Pass 9 Pass
3 Fail 1 Fail
Pass .flexbox 1 Pass .flexbox 1
Pass .flexbox 2 Pass .flexbox 2
Pass .flexbox 3 Pass .flexbox 3
Pass .flexbox 4 Pass .flexbox 4
Fail .flexbox 5 Fail .flexbox 5
Pass .flexbox 6 Pass .flexbox 6
Fail .flexbox 7 Pass .flexbox 7
Pass .flexbox 8 Pass .flexbox 8
Pass .flexbox 9 Pass .flexbox 9
Fail .flexbox 10 Pass .flexbox 10