RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 21:28:11 +00:00
Code Issues Activity Actions

LibWeb: Parse transform property using TokenStream

Browse source 
While I'm at it, use the helper for "none", and remove the unnecessary
whitespace skipping.
This commit is contained in:
Sam Atkins 2023-12-08 17:44:57 +00:00 • committed by Sam Atkins
parent 6a6995cb12
commit dd5adb28fd
2 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4814,25 +4814,18 @@ RefPtr<StyleValue> Parser::parse_easing_value(TokenStream<ComponentValue>& token
return EasingStyleValue::create(function, move(values)); return EasingStyleValue::create(function, move(values));
} }
RefPtr<StyleValue> Parser::parse_transform_value(Vector<ComponentValue> const& component_values) RefPtr<StyleValue> Parser::parse_transform_value(TokenStream<ComponentValue>& tokens)
{ {
if (contains_single_none_ident(tokens)) {
tokens.next_token(); // none
return IdentifierStyleValue::create(ValueID::None);
}
StyleValueVector transformations; StyleValueVector transformations;
auto tokens = TokenStream { component_values }; auto transaction = tokens.begin_transaction();
tokens.skip_whitespace();
while (tokens.has_next_token()) { while (tokens.has_next_token()) {
tokens.skip_whitespace();
auto const& part = tokens.next_token(); auto const& part = tokens.next_token();
if (part.is_ident("none"sv)) {
if (!transformations.is_empty())
return nullptr;
tokens.skip_whitespace();
if (tokens.has_next_token())
return nullptr;
return IdentifierStyleValue::create(ValueID::None);
}
if (!part.is_function()) if (!part.is_function())
return nullptr; return nullptr;
auto maybe_function = transform_function_from_string(part.function().name()); auto maybe_function = transform_function_from_string(part.function().name());
@ -4936,6 +4929,7 @@ RefPtr<StyleValue> Parser::parse_transform_value(Vector<ComponentValue> const& c
transformations.append(TransformationStyleValue::create(function, move(values))); transformations.append(TransformationStyleValue::create(function, move(values)));
} }
transaction.commit();
return StyleValueList::create(move(transformations), StyleValueList::Separator::Space); return StyleValueList::create(move(transformations), StyleValueList::Separator::Space);
} }
@ -5944,7 +5938,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::Transform: case PropertyID::Transform:
if (auto parsed_value = parse_transform_value(component_values)) if (auto parsed_value = parse_transform_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::TransformOrigin: case PropertyID::TransformOrigin:

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

@ -256,7 +256,7 @@ private:
RefPtr<StyleValue> parse_text_decoration_value(TokenStream<ComponentValue>&); RefPtr<StyleValue> parse_text_decoration_value(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_text_decoration_line_value(TokenStream<ComponentValue>&); RefPtr<StyleValue> parse_text_decoration_line_value(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_easing_value(TokenStream<ComponentValue>&); RefPtr<StyleValue> parse_easing_value(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_transform_value(Vector<ComponentValue> const&); RefPtr<StyleValue> parse_transform_value(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_transform_origin_value(Vector<ComponentValue> const&); RefPtr<StyleValue> parse_transform_origin_value(Vector<ComponentValue> const&);
RefPtr<StyleValue> parse_grid_track_size_list(Vector<ComponentValue> const&, bool allow_separate_line_name_blocks = false); RefPtr<StyleValue> parse_grid_track_size_list(Vector<ComponentValue> const&, bool allow_separate_line_name_blocks = false);
RefPtr<StyleValue> parse_grid_auto_track_sizes(Vector<ComponentValue> const&); RefPtr<StyleValue> parse_grid_auto_track_sizes(Vector<ComponentValue> const&);