RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:47:34 +00:00
Code Issues Activity Actions

LibWeb: Parse list-style property using TokenStream

Browse source
This commit is contained in:
Sam Atkins 2023-12-08 17:00:58 +00:00 • committed by Sam Atkins
parent 14e2e2bac4
commit 6e0a550a03
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4366,11 +4366,8 @@ Vector<FontFace::Source> Parser::parse_font_face_src(TokenStream<ComponentValue>
return supported_sources; return supported_sources;
} }
RefPtr<StyleValue> Parser::parse_list_style_value(Vector<ComponentValue> const& component_values) RefPtr<StyleValue> Parser::parse_list_style_value(TokenStream<ComponentValue>& tokens)
{ {
if (component_values.size() > 3)
return nullptr;
RefPtr<StyleValue> list_position; RefPtr<StyleValue> list_position;
RefPtr<StyleValue> list_image; RefPtr<StyleValue> list_image;
RefPtr<StyleValue> list_type; RefPtr<StyleValue> list_type;
@ -4378,7 +4375,7 @@ RefPtr<StyleValue> Parser::parse_list_style_value(Vector<ComponentValue> const&
Vector<PropertyID> remaining_longhands { PropertyID::ListStyleImage, PropertyID::ListStylePosition, PropertyID::ListStyleType }; Vector<PropertyID> remaining_longhands { PropertyID::ListStyleImage, PropertyID::ListStylePosition, PropertyID::ListStyleType };
auto tokens = TokenStream { component_values }; auto transaction = tokens.begin_transaction();
while (tokens.has_next_token()) { while (tokens.has_next_token()) {
if (auto peek = tokens.peek_token(); peek.is_ident("none"sv)) { if (auto peek = tokens.peek_token(); peek.is_ident("none"sv)) {
(void)tokens.next_token(); (void)tokens.next_token();
@ -4440,6 +4437,7 @@ RefPtr<StyleValue> Parser::parse_list_style_value(Vector<ComponentValue> const&
if (!list_type) if (!list_type)
list_type = property_initial_value(m_context.realm(), PropertyID::ListStyleType); list_type = property_initial_value(m_context.realm(), PropertyID::ListStyleType);
transaction.commit();
return ShorthandStyleValue::create(PropertyID::ListStyle, return ShorthandStyleValue::create(PropertyID::ListStyle,
{ PropertyID::ListStylePosition, PropertyID::ListStyleImage, PropertyID::ListStyleType }, { PropertyID::ListStylePosition, PropertyID::ListStyleImage, PropertyID::ListStyleType },
{ list_position.release_nonnull(), list_image.release_nonnull(), list_type.release_nonnull() }); { list_position.release_nonnull(), list_image.release_nonnull(), list_type.release_nonnull() });
@ -5905,7 +5903,7 @@ Parser::ParseErrorOr<NonnullRefPtr<StyleValue>> Parser::parse_css_value(Property
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
return ParseError::SyntaxError; return ParseError::SyntaxError;
case PropertyID::ListStyle: case PropertyID::ListStyle:
if (auto parsed_value = parse_list_style_value(component_values)) if (auto parsed_value = parse_list_style_value(tokens); parsed_value && !tokens.has_next_token())
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
return ParseError::SyntaxError; return ParseError::SyntaxError;
case PropertyID::MathDepth: case PropertyID::MathDepth:

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

@ -240,7 +240,7 @@ private:
RefPtr<StyleValue> parse_flex_flow_value(TokenStream<ComponentValue>&); RefPtr<StyleValue> parse_flex_flow_value(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_font_value(TokenStream<ComponentValue>&); RefPtr<StyleValue> parse_font_value(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_font_family_value(TokenStream<ComponentValue>&); RefPtr<StyleValue> parse_font_family_value(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_list_style_value(Vector<ComponentValue> const&); RefPtr<StyleValue> parse_list_style_value(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_math_depth_value(Vector<ComponentValue> const&); RefPtr<StyleValue> parse_math_depth_value(Vector<ComponentValue> const&);
RefPtr<StyleValue> parse_overflow_value(Vector<ComponentValue> const&); RefPtr<StyleValue> parse_overflow_value(Vector<ComponentValue> const&);
RefPtr<StyleValue> parse_place_content_value(Vector<ComponentValue> const&); RefPtr<StyleValue> parse_place_content_value(Vector<ComponentValue> const&);