beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibWeb: Do not resolve inline block height early if height is definite
Some checks are pending
CI / Lagom (false, FUZZ, ubuntu-24.04, Linux, Clang) (push) Waiting to run
Details
CI / Lagom (false, NO_FUZZ, macos-14, macOS, Clang) (push) Waiting to run
Details
CI / Lagom (false, NO_FUZZ, ubuntu-24.04, Linux, GNU) (push) Waiting to run
Details
CI / Lagom (true, NO_FUZZ, ubuntu-24.04, Linux, Clang) (push) Waiting to run
Details
Package the js repl as a binary artifact / build-and-package (macos-14, macOS, macOS-universal2) (push) Waiting to run
Details
Package the js repl as a binary artifact / build-and-package (ubuntu-24.04, Linux, Linux-x86_64) (push) Waiting to run
Details
Run test262 and test-wasm / run_and_update_results (push) Waiting to run
Details
Lint Code / lint (push) Waiting to run
Details
Push notes / build (push) Waiting to run
Details

Browse source 
This condition was included to implement flex containers with auto
height, but it actually can reset the definitive height to 0 for inline
blocks with only replaced elements such as an SVG. Removing the
condition does not break any in-tree test, so let's improve the
situation on the SVG side of things for now.
This commit is contained in:
Jelle Raaijmakers 2024-10-24 16:52:11 +02:00
parent b6e28ff807
commit 352a66390f
Notes: github-actions[bot] 2024-10-25 13:14:23 +00:00 
Author: https://github.com/gmta
Commit: https://github.com/LadybirdBrowser/ladybird/commit/352a66390f2
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/1942
3 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Tests/LibWeb/Layout/expected/svg/svg-inside-inline-block.txt Normal file
View file

@ -0,0 +1,18 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x66 [BFC] children: not-inline
BlockContainer <body> at (8,8) content-size 784x50 children: not-inline
BlockContainer <div#a> at (8,8) content-size 100x50 children: inline
frag 0 from BlockContainer start: 0, length: 0, rect: [8,8 100x50] baseline: 50
TextNode <#text>
BlockContainer <div#b> at (8,8) content-size 100x50 inline-block [BFC] children: inline
frag 0 from SVGSVGBox start: 0, length: 0, rect: [8,8 100x50] baseline: 50
TextNode <#text>
SVGSVGBox <svg> at (8,8) content-size 100x50 [SVG] children: inline
TextNode <#text>
ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x66]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x50]
PaintableWithLines (BlockContainer<DIV>#a) [8,8 100x50]
PaintableWithLines (BlockContainer<DIV>#b) [8,8 100x50]
SVGSVGPaintable (SVGSVGBox<svg>) [8,8 100x50]

19
Tests/LibWeb/Layout/input/svg/svg-inside-inline-block.html Normal file
View file

@ -0,0 +1,19 @@
<!doctype html>
<style>
#a {
background-color: #f00;
height: 50px;
width: 100px;
}
#b {
display: inline-block;
height: 100%;
}
svg {
background-color: #0f0;
height: 100%;
}
</style>
<div id="a">
<div id="b">
<svg viewBox="0 0 100 50">

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

@ -180,7 +180,7 @@ void InlineFormattingContext::dimension_box_on_line(Box const& box, LayoutMode l
parent().resolve_used_height_if_not_treated_as_auto(box, AvailableSpace(AvailableSize::make_definite(width), AvailableSize::make_indefinite()));
// NOTE: Flex containers with `auto` height are treated as `max-content`, so we can compute their height early.
if (box_state.has_definite_height() || box.display().is_flex_inside())
if (box.display().is_flex_inside())
parent().resolve_used_height_if_treated_as_auto(box, AvailableSpace(AvailableSize::make_definite(width), AvailableSize::make_indefinite()));
auto independent_formatting_context = layout_inside(box, layout_mode, box_state.available_inner_space_or_constraints_from(*m_available_space));