system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 02:26:11 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibWeb: Default to an empty string when a string attr substitution fails

Browse source 
When a string-type attr() substitution produces no value and no fallback
had been specified, the spec mandates we default to the empty string.
This commit is contained in:
Timothy Flynn 2024-04-16 12:42:23 -04:00 committed by Andreas Kling
parent 4ced84a548
commit bf1c82724f
6 changed files with 34 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Tests/LibWeb/Layout/expected/css-attr-typed-fallback.txt
View file

@ -1,6 +1,6 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x126 [BFC] children: not-inline
BlockContainer <body> at (8,8) content-size 784x110 children: not-inline
BlockContainer <html> at (0,0) content-size 800x148 [BFC] children: not-inline
BlockContainer <body> at (8,8) content-size 784x132 children: not-inline
BlockContainer <div.string> at (9,9) content-size 100x20 children: inline
InlineNode <(anonymous)>
frag 0 from TextNode start: 0, length: 4, rect: [9,9 41.53125x17] baseline: 13.296875
@ -8,31 +8,39 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TextNode <#text>
BlockContainer <(anonymous)> at (8,30) content-size 784x0 children: inline
TextNode <#text>
BlockContainer <div.length> at (9,31) content-size 200x20 children: not-inline
BlockContainer <div.string-no-fallback> at (9,31) content-size 100x20 children: inline
InlineNode <(anonymous)>
TextNode <#text>
BlockContainer <(anonymous)> at (8,52) content-size 784x0 children: inline
TextNode <#text>
BlockContainer <div.px> at (9,53) content-size 200x20 children: not-inline
BlockContainer <div.length> at (9,53) content-size 200x20 children: not-inline
BlockContainer <(anonymous)> at (8,74) content-size 784x0 children: inline
TextNode <#text>
BlockContainer <div.color> at (9,75) content-size 100x20 children: not-inline
BlockContainer <div.px> at (9,75) content-size 200x20 children: not-inline
BlockContainer <(anonymous)> at (8,96) content-size 784x0 children: inline
TextNode <#text>
BlockContainer <div.color> at (9,97) content-size 100x20 children: not-inline
BlockContainer <(anonymous)> at (8,118) content-size 784x0 children: inline
TextNode <#text>
BlockContainer <div.color> at (9,119) content-size 100x20 children: not-inline
BlockContainer <(anonymous)> at (8,140) content-size 784x0 children: inline
TextNode <#text>
ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x126]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x110]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x148]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x132]
PaintableWithLines (BlockContainer<DIV>.string) [8,8 102x22]
InlinePaintable (InlineNode(anonymous))
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer(anonymous)) [8,30 784x0]
PaintableWithLines (BlockContainer<DIV>.length) [8,30 202x22]
PaintableWithLines (BlockContainer<DIV>.string-no-fallback) [8,30 102x22]
InlinePaintable (InlineNode(anonymous))
PaintableWithLines (BlockContainer(anonymous)) [8,52 784x0]
PaintableWithLines (BlockContainer<DIV>.px) [8,52 202x22]
PaintableWithLines (BlockContainer<DIV>.length) [8,52 202x22]
PaintableWithLines (BlockContainer(anonymous)) [8,74 784x0]
PaintableWithLines (BlockContainer<DIV>.color) [8,74 102x22]
PaintableWithLines (BlockContainer<DIV>.px) [8,74 202x22]
PaintableWithLines (BlockContainer(anonymous)) [8,96 784x0]
PaintableWithLines (BlockContainer<DIV>.color) [8,96 102x22]
PaintableWithLines (BlockContainer(anonymous)) [8,118 784x0]
PaintableWithLines (BlockContainer<DIV>.color) [8,118 102x22]
PaintableWithLines (BlockContainer(anonymous)) [8,140 784x0]

4
Tests/LibWeb/Layout/input/css-attr-typed-fallback.html
View file

@ -9,6 +9,9 @@
.string::before {
content: attr(foo string, "WHF!");
}
.string-no-fallback::before {
content: attr(foo string);
}
.length {
width: attr(foo length, 200px);
}
@ -20,6 +23,7 @@
}
</style>
<div class="string"></div>
<div class="string-no-fallback"></div>
<div class="length" foo="90pizzas"></div>
<div class="px" foo="twohundred"></div>
<div class="color" foo="grunge"></div>

4
Tests/LibWeb/Ref/css-attr-typed-fallback.html
View file

@ -9,6 +9,9 @@
.string::before {
content: attr(foo string, "WHF!");
}
.string-no-fallback::before {
content: attr(foo string);
}
.length {
width: attr(foo length, 200px);
}
@ -20,6 +23,7 @@
}
</style>
<div class="string"></div>
<div class="string-no-fallback"></div>
<div class="length" foo="90pizzas"></div>
<div class="px" foo="twohundred"></div>
<div class="color" foo="grunge"></div>

1
Tests/LibWeb/Ref/css-attr-typed.html
View file

@ -20,6 +20,7 @@
}
</style>
<div class="string" foo="WHF!"></div>
<div class="string" foo=""></div>
<div class="length" foo="200px"></div>
<div class="px" foo="200"></div>
<div class="color" foo="lime"></div>

1
Tests/LibWeb/Ref/reference/css-attr-typed-ref.html
View file

@ -16,6 +16,7 @@
}
</style>
<div>WHF!</div>
<div></div>
<div class="length"></div>
<div class="px"></div>
<div class="color" foo="green"></div>

6
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -7450,6 +7450,12 @@ bool Parser::substitute_attr_function(DOM::Element& element, FlyString const& pr
if (has_fallback_values)
return expand_unresolved_values(element, property_name, attr_contents, dest);
if (attribute_type.equals_ignoring_ascii_case("string"_fly_string)) {
// If the <attr-type> argument is string, defaults to the empty string if omitted
dest.empend(Token::create_string({}));
return true;
}
// 3. Otherwise, the property containing the attr() function is invalid at computed-value time.
return false;
}