0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

LibWeb: Ignore "display: contents" boxes while inserting inline nodes

Browse source 
With this change "display: contents" ancestors are not considered as
insertion point for inline nodes similar to how we already ignore them
for non-inline nodes.

Fixes https://github.com/SerenityOS/serenity/issues/22396
This commit is contained in:
Aliaksandr Kalenik 2023-12-23 20:10:42 +01:00 • committed by Andreas Kling
parent 67522fab2e
commit 0a7e4a0d22
Notes: sideshowbarker 2024-07-17 02:29:45 +09:00
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Tests/LibWeb/Layout/expected/display-contents-with-in-children.txt Normal file
View file

@ -0,0 +1,12 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x17.46875 [BFC] children: inline
line 0 width: 51.75, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 7, rect: [0,0 51.75x17.46875]
"whf :^)"
InlineNode <span>
TextNode <#text>
ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x17.46875]
InlinePaintable (InlineNode<SPAN>)
TextPaintable (TextNode<#text>)

2
Tests/LibWeb/Layout/input/display-contents-with-in-children.html Normal file
View file

@ -0,0 +1,2 @@
<!DOCTYPE html><style> body { display: contents; }
</style><body><span>whf :^)</span></body>

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

@ -148,8 +148,15 @@ void TreeBuilder::insert_node_into_inline_or_block_ancestor(Layout::Node& node,
return;
if (display.is_inline_outside()) {
// Inlines can be inserted into the nearest ancestor.
auto& insertion_point = insertion_parent_for_inline_node(m_ancestor_stack.last());
// Inlines can be inserted into the nearest ancestor without "display: contents".
auto& nearest_ancestor_without_display_contents = [&]() -> Layout::NodeWithStyle& {
for (auto& ancestor : m_ancestor_stack.in_reverse()) {
if (!ancestor->display().is_contents())
return ancestor;
}
VERIFY_NOT_REACHED();
}();
auto& insertion_point = insertion_parent_for_inline_node(nearest_ancestor_without_display_contents);
if (mode == AppendOrPrepend::Prepend)
insertion_point.prepend_child(node);
else