RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:17:44 +00:00
Code Issues Activity Actions

LibWeb: Use new StyleValue parsing for "simple" properties

Browse source 
That is, properties that don't have a bespoke parsing function.
This commit is contained in:
Sam Atkins 2023-05-17 17:31:07 +01:00 • committed by Andreas Kling
parent bcacc2357e
commit d90ad19201
2 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4145,11 +4145,10 @@ ErrorOr<RefPtr<StyleValue>> Parser::parse_comma_separated_value_list(Vector<Comp
return StyleValueList::create(move(values), StyleValueList::Separator::Comma); return StyleValueList::create(move(values), StyleValueList::Separator::Comma);
} }
ErrorOr<RefPtr<StyleValue>> Parser::parse_simple_comma_separated_value_list(Vector<ComponentValue> const& component_values) ErrorOr<RefPtr<StyleValue>> Parser::parse_simple_comma_separated_value_list(PropertyID property_id, Vector<ComponentValue> const& component_values)
{ {
return parse_comma_separated_value_list(component_values, [=, this](auto& tokens) -> ErrorOr<RefPtr<StyleValue>> { return parse_comma_separated_value_list(component_values, [=, this](auto& tokens) -> ErrorOr<RefPtr<StyleValue>> {
auto& token = tokens.next_token(); if (auto value = TRY(parse_css_value_for_property(property_id, tokens)))
if (auto value = TRY(parse_css_value(token)); value && property_accepts_value(m_context.current_property_id(), *value))
return value; return value;
tokens.reconsume_current_input_token(); tokens.reconsume_current_input_token();
return nullptr; return nullptr;
@ -6960,7 +6959,7 @@ Parser::ParseErrorOr<NonnullRefPtr<StyleValue>> Parser::parse_css_value(Property
case PropertyID::BackgroundClip: case PropertyID::BackgroundClip:
case PropertyID::BackgroundImage: case PropertyID::BackgroundImage:
case PropertyID::BackgroundOrigin: case PropertyID::BackgroundOrigin:
if (auto parsed_value = FIXME_TRY(parse_simple_comma_separated_value_list(component_values))) if (auto parsed_value = FIXME_TRY(parse_simple_comma_separated_value_list(property_id, component_values)))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
return ParseError::SyntaxError; return ParseError::SyntaxError;
case PropertyID::BackgroundPosition: case PropertyID::BackgroundPosition:
@ -7122,27 +7121,31 @@ Parser::ParseErrorOr<NonnullRefPtr<StyleValue>> Parser::parse_css_value(Property
break; break;
} }
// If there's only 1 ComponentValue, we can only produce a single StyleValue.
if (component_values.size() == 1) { if (component_values.size() == 1) {
if (auto parsed_value = FIXME_TRY(parse_css_value(component_values.first()))) { auto stream = TokenStream { component_values };
if (property_accepts_value(property_id, *parsed_value)) if (auto parsed_value = FIXME_TRY(parse_css_value_for_property(property_id, stream)))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
}
return ParseError::SyntaxError; return ParseError::SyntaxError;
} }
// We have multiple values, so treat them as a StyleValueList. // Multiple ComponentValues will usually produce multiple StyleValues, so make a StyleValueList.
if (property_maximum_value_count(property_id) > 1) { StyleValueVector parsed_values;
StyleValueVector parsed_values; auto stream = TokenStream { component_values };
for (auto& component_value : component_values) { while (auto parsed_value = FIXME_TRY(parse_css_value_for_property(property_id, stream))) {
auto parsed_value = FIXME_TRY(parse_css_value(component_value)); FIXME_TRY(parsed_values.try_append(parsed_value.release_nonnull()));
if (!parsed_value || !property_accepts_value(property_id, *parsed_value)) if (!stream.has_next_token())
return ParseError::SyntaxError; break;
parsed_values.append(parsed_value.release_nonnull());
}
if (!parsed_values.is_empty() && parsed_values.size() <= property_maximum_value_count(property_id))
return FIXME_TRY(StyleValueList::create(move(parsed_values), StyleValueList::Separator::Space));
} }
// Some types (such as <ratio>) can be made from multiple ComponentValues, so if we only made 1 StyleValue, return it directly.
if (parsed_values.size() == 1)
return *parsed_values.take_first();
if (!parsed_values.is_empty() && parsed_values.size() <= property_maximum_value_count(property_id))
return FIXME_TRY(StyleValueList::create(move(parsed_values), StyleValueList::Separator::Space));
return ParseError::SyntaxError; return ParseError::SyntaxError;
#undef FIXME_TRY #undef FIXME_TRY
} }

2
Userland/Libraries/LibWeb/CSS/Parser/Parser.h
View file

@ -299,7 +299,7 @@ private:
ErrorOr<RefPtr<StyleValue>> parse_image_value(ComponentValue const&); ErrorOr<RefPtr<StyleValue>> parse_image_value(ComponentValue const&);
template<typename ParseFunction> template<typename ParseFunction>
ErrorOr<RefPtr<StyleValue>> parse_comma_separated_value_list(Vector<ComponentValue> const&, ParseFunction); ErrorOr<RefPtr<StyleValue>> parse_comma_separated_value_list(Vector<ComponentValue> const&, ParseFunction);
ErrorOr<RefPtr<StyleValue>> parse_simple_comma_separated_value_list(Vector<ComponentValue> const&); ErrorOr<RefPtr<StyleValue>> parse_simple_comma_separated_value_list(PropertyID, Vector<ComponentValue> const&);
ErrorOr<RefPtr<StyleValue>> parse_filter_value_list_value(Vector<ComponentValue> const&); ErrorOr<RefPtr<StyleValue>> parse_filter_value_list_value(Vector<ComponentValue> const&);
ErrorOr<RefPtr<StyleValue>> parse_background_value(Vector<ComponentValue> const&); ErrorOr<RefPtr<StyleValue>> parse_background_value(Vector<ComponentValue> const&);