system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-09-06 17:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Allow font-family names to start with -

Browse source 
We achieve this by making properties that accept a custom-ident value
skip the "someone else's vendor prefix" check for values that start with
a `-` character.

This fixes an issue where e.g `font-family: Arial, -apple-system` would
be rejected by the parser completely. We now treat `-apple-system` like
an identifier in such cases.

Also add `valid-types` metadata for the `font-family` property so this
actually works. :^)
This commit is contained in:
Andreas Kling 2023-07-06 13:05:48 +02:00
parent dfdb31f5b0
commit 5955a504e0
4 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Tests/LibWeb/Text/expected/css/font-family-with-dash-prefix.txt Normal file
View file

@ -0,0 +1 @@
serif, -apple-system

9
Tests/LibWeb/Text/input/css/font-family-with-dash-prefix.html Normal file
View file

@ -0,0 +1,9 @@
<script src="../include.js"></script>
<script>
test(() => {
const e = document.createElement("div");
e.style.fontFamily = 'sans-serif';
e.style.fontFamily = 'serif, -apple-system';
println(e.style.fontFamily);
});
</script>

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

@ -7928,6 +7928,7 @@ Parser::ParseErrorOr<NonnullRefPtr<StyleValue>> Parser::parse_css_value(Property
m_context.set_current_property_id(property_id);
Vector<ComponentValue> component_values;
bool contains_var_or_attr = false;
bool const property_accepts_custom_ident = property_accepts_type(property_id, ValueType::CustomIdent);
while (tokens.has_next_token()) {
auto const& token = tokens.next_token();
@ -7941,7 +7942,7 @@ Parser::ParseErrorOr<NonnullRefPtr<StyleValue>> Parser::parse_css_value(Property
if (token.is(Token::Type::Whitespace))
continue;
if (token.is(Token::Type::Ident) && has_ignored_vendor_prefix(token.token().ident()))
if (!property_accepts_custom_ident && token.is(Token::Type::Ident) && has_ignored_vendor_prefix(token.token().ident()))
return ParseError::IncludesIgnoredVendorPrefix;
}

6
Userland/Libraries/LibWeb/CSS/Properties.json
View file

@ -851,7 +851,11 @@
},
"font-family": {
"inherited": true,
"initial": "sans-serif"
"initial": "sans-serif",
"valid-types": [
"custom-ident",
"string"
]
},
"font-size": {
"inherited": true,