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

LibWeb: Don't crash on encountering display: list-item on pseudo element

Browse source 
On any `display: list-item` Node a CSS pseudo element (`::marker`) needs
to be created. This commit allows the ::maker pseudo element to be
nested within other pseudo elements (e. g. ::before or ::after).

This fixes this WPT test:
http://wpt.live/css/CSS2/generated-content/after-content-display-003.xht
This commit is contained in:
Simon König 2024-10-15 23:07:58 +02:00 committed by Sam Atkins
parent 0c04bd6676
commit 15d2857a01
Notes: github-actions[bot] 2024-10-17 06:43:58 +00:00 
Author: https://github.com/Stausee1337 🔰
Commit: https://github.com/LadybirdBrowser/ladybird/commit/15d2857a01b
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/1825
Reviewed-by: https://github.com/AtkinsSJ ✅
3 changed files with 51 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Tests/LibWeb/Layout/expected/css-pseudo-element-display-list-item.txt Normal file
View file

@ -0,0 +1,26 @@
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 784x34 children: not-inline
BlockContainer <div> at (8,8) content-size 784x34 children: not-inline
BlockContainer <(anonymous)> at (8,8) content-size 784x17 children: inline
frag 0 from TextNode start: 0, length: 11, rect: [8,8 83.265625x17] baseline: 13.296875
"Filler text"
TextNode <#text>
ListItemBox <(anonymous)> at (24,25) content-size 768x17 children: inline
frag 0 from TextNode start: 0, length: 11, rect: [24,25 88.703125x17] baseline: 13.296875
"Filler Text"
ListItemMarkerBox <(anonymous)> at (0,25) content-size 12x17 children: not-inline
TextNode <#text>
BlockContainer <(anonymous)> at (8,42) content-size 784x0 children: inline
TextNode <#text>
ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x34]
PaintableWithLines (BlockContainer<DIV>) [8,8 784x34]
PaintableWithLines (BlockContainer(anonymous)) [8,8 784x17]
TextPaintable (TextNode<#text>)
PaintableWithLines (ListItemBox(anonymous)) [24,25 768x17]
MarkerPaintable (ListItemMarkerBox(anonymous)) [0,25 12x17]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer(anonymous)) [8,42 784x0]

9
Tests/LibWeb/Layout/input/css-pseudo-element-display-list-item.html Normal file
View file

@ -0,0 +1,9 @@
<style>
div::after {
content: "Filler Text";
display: list-item;
margin-left: 1em;
}
</style>
<div>Filler text</div>

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

@ -211,6 +211,22 @@ void TreeBuilder::create_pseudo_element_if_needed(DOM::Element& element, CSS::Se
if (!pseudo_element_node)
return;
auto& style_computer = document.style_computer();
// FIXME: This code actually computes style for element::marker, and shouldn't for element::pseudo::marker
if (is<ListItemBox>(*pseudo_element_node)) {
auto marker_style = style_computer.compute_style(element, CSS::Selector::PseudoElement::Type::Marker);
auto list_item_marker = document.heap().allocate_without_realm<ListItemMarkerBox>(
document,
pseudo_element_node->computed_values().list_style_type(),
pseudo_element_node->computed_values().list_style_position(),
0,
*marker_style);
static_cast<ListItemBox&>(*pseudo_element_node).set_marker(list_item_marker);
element.set_pseudo_element_node({}, CSS::Selector::PseudoElement::Type::Marker, list_item_marker);
pseudo_element_node->append_child(*list_item_marker);
}
auto generated_for = Node::GeneratedFor::NotGenerated;
if (pseudo_element == CSS::Selector::PseudoElement::Type::Before) {
generated_for = Node::GeneratedFor::PseudoBefore;