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

LibWeb: Consolidate consecutive inlines in a single anonymous flex item

Browse source 
Before this change, we were creating a new anonymous flex item for every
inline-level child of a flex container, even when we had a sequence of
inline-level children.

The fix here is to simply keep putting things in the last child of the
flex container, if that child is already an anonymous flex item.
This commit is contained in:
Andreas Kling 2023-09-01 10:06:28 +02:00
parent d54cd23615
commit ef9b6c25fa
3 changed files with 38 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Tests/LibWeb/Layout/expected/flex/br-element-does-not-get-blockified-by-itself.txt Normal file
View file

@ -0,0 +1,28 @@
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 784x53.34375 children: not-inline
Box <div> at (8,8) content-size 784x53.34375 flex-container(row) [FFC] children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 55.359375x53.34375 flex-item [BFC] children: inline
line 0 width: 28.40625, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 1, length: 4, rect: [8,8 28.40625x17.46875]
"well"
line 1 width: 36.84375, height: 17.9375, bottom: 35.40625, baseline: 13.53125
frag 0 from TextNode start: 1, length: 5, rect: [8,25 36.84375x17.46875]
"hello"
line 2 width: 55.359375, height: 18.40625, bottom: 53.34375, baseline: 13.53125
frag 0 from TextNode start: 1, length: 7, rect: [8,42 55.359375x17.46875]
"friends"
TextNode <#text>
BreakNode <br>
TextNode <#text>
BreakNode <br>
TextNode <#text>
ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x53.34375]
PaintableBox (Box<DIV>) [8,8 784x53.34375]
PaintableWithLines (BlockContainer(anonymous)) [8,8 55.359375x53.34375]
TextPaintable (TextNode<#text>)
TextPaintable (TextNode<#text>)
TextPaintable (TextNode<#text>)

8
Tests/LibWeb/Layout/input/flex/br-element-does-not-get-blockified-by-itself.html Normal file
View file

@ -0,0 +1,8 @@
<!doctype><style>
* { outline: 1px solid black; }
div { display: flex; }
</style>
<div>
well<br>
hello<br>
friends

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

@ -69,6 +69,8 @@ static Layout::Node& insertion_parent_for_inline_node(Layout::NodeWithStyle& lay
return layout_parent;
if (layout_parent.display().is_flex_inside() || layout_parent.display().is_grid_inside()) {
if (layout_parent.last_child() && layout_parent.last_child()->is_anonymous() && layout_parent.last_child()->children_are_inline())
return *layout_parent.last_child();
layout_parent.append_child(layout_parent.create_anonymous_wrapper());
return *layout_parent.last_child();
}