RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 13:22:43 +00:00
Code Issues Activity Actions

LibWeb: Add parsing for custom properties

Browse source 
This parses 'some-property: var(--some-name)' and stores its findings
in a CustomStyleValue.
It also parses the custom properties like '--some-name: some-value' and
puts them into the StyleProperty.
This commit is contained in:
Tobias Christiansen 2021-05-24 22:49:49 +02:00 • committed by Linus Groh
parent 0d7169b91a
commit c4588a2cde
1 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.cpp
View file

@ -214,7 +214,19 @@ static CSS::Length parse_length(const CSS::ParsingContext& context, const String
static bool takes_integer_value(CSS::PropertyID property_id) static bool takes_integer_value(CSS::PropertyID property_id)
{ {
return property_id == CSS::PropertyID::ZIndex || property_id == CSS::PropertyID::FontWeight; return property_id == CSS::PropertyID::ZIndex || property_id == CSS::PropertyID::FontWeight || property_id == CSS::PropertyID::Custom;
}
static StringView parse_custom_property_name(StringView value)
{
if (!value.starts_with("var(") && !value.ends_with(")"))
return {};
// FIXME: Allow for fallback
auto first_comma_index = value.find_first_of(",");
auto length = value.length();
auto substring_length = first_comma_index.has_value() ? first_comma_index.value() - 4 - 1 : length - 4 - 1;
return value.substring_view(4, substring_length);
} }
RefPtr<CSS::StyleValue> parse_css_value(const CSS::ParsingContext& context, const StringView& string, CSS::PropertyID property_id) RefPtr<CSS::StyleValue> parse_css_value(const CSS::ParsingContext& context, const StringView& string, CSS::PropertyID property_id)
@ -239,6 +251,8 @@ RefPtr<CSS::StyleValue> parse_css_value(const CSS::ParsingContext& context, cons
return CSS::InitialStyleValue::create(); return CSS::InitialStyleValue::create();
if (string.equals_ignoring_case("auto")) if (string.equals_ignoring_case("auto"))
return CSS::LengthStyleValue::create(CSS::Length::make_auto()); return CSS::LengthStyleValue::create(CSS::Length::make_auto());
if (string.starts_with("var("))
return CSS::CustomStyleValue::create(parse_custom_property_name(string));
auto value_id = CSS::value_id_from_string(string); auto value_id = CSS::value_id_from_string(string);
if (value_id != CSS::ValueID::Invalid) if (value_id != CSS::ValueID::Invalid)
@ -802,7 +816,11 @@ public:
} }
auto property_id = CSS::property_id_from_string(property_name); auto property_id = CSS::property_id_from_string(property_name);
if (property_id == CSS::PropertyID::Invalid && !property_name.starts_with('-')) {
if (property_id == CSS::PropertyID::Invalid && property_name.starts_with("--"))
property_id = CSS::PropertyID::Custom;
if (property_id == CSS::PropertyID::Invalid && !property_name.starts_with("-")) {
dbgln("CSSParser: Unrecognized property '{}'", property_name); dbgln("CSSParser: Unrecognized property '{}'", property_name);
} }
auto value = parse_css_value(m_context, property_value, property_id); auto value = parse_css_value(m_context, property_value, property_id);