LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-21 02:08:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Parse background property using TokenStream

Browse Source
This commit is contained in:
Sam Atkins 2023-12-07 15:21:17 +00:00 committed by Sam Atkins
parent 64a44b719e
commit 0e00d9a67d
Notes: sideshowbarker 2024-07-17 01:46:43 +09:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/SerenityOS/serenity/commit/0e00d9a67d
Pull-request: https://github.com/SerenityOS/serenity/pull/22200
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
View File

@ -2731,8 +2731,10 @@ RefPtr<StyleValue> Parser::parse_aspect_ratio_value(TokenStream<ComponentValue>&
return nullptr;
}
RefPtr<StyleValue> Parser::parse_background_value(Vector<ComponentValue> const& component_values)
RefPtr<StyleValue> Parser::parse_background_value(TokenStream<ComponentValue>& tokens)
{
auto transaction = tokens.begin_transaction();
auto make_background_shorthand = [&](auto background_color, auto background_image, auto background_position, auto background_size, auto background_repeat, auto background_attachment, auto background_origin, auto background_clip) {
return ShorthandStyleValue::create(PropertyID::Background,
{ PropertyID::BackgroundColor, PropertyID::BackgroundImage, PropertyID::BackgroundPosition, PropertyID::BackgroundSize, PropertyID::BackgroundRepeat, PropertyID::BackgroundAttachment, PropertyID::BackgroundOrigin, PropertyID::BackgroundClip },
@ -2823,7 +2825,6 @@ RefPtr<StyleValue> Parser::parse_background_value(Vector<ComponentValue> const&
remaining_layer_properties.unchecked_append(PropertyID::BackgroundRepeat);
};
auto tokens = TokenStream { component_values };
while (tokens.has_next_token()) {
if (tokens.peek_token().is(Token::Type::Comma)) {
has_multiple_layers = true;
@ -2875,11 +2876,11 @@ RefPtr<StyleValue> Parser::parse_background_value(Vector<ComponentValue> const&
background_position = value.release_nonnull();
// Attempt to parse `/ <background-size>`
auto transaction = tokens.begin_transaction();
auto background_size_transaction = tokens.begin_transaction();
auto& maybe_slash = tokens.next_token();
if (maybe_slash.is_delim('/')) {
if (auto maybe_background_size = parse_single_background_size_value(tokens)) {
transaction.commit();
background_size_transaction.commit();
background_size = maybe_background_size.release_nonnull();
continue;
}
@ -2913,6 +2914,7 @@ RefPtr<StyleValue> Parser::parse_background_value(Vector<ComponentValue> const&
if (!background_color)
background_color = initial_background_color;
transaction.commit();
return make_background_shorthand(
background_color.release_nonnull(),
StyleValueList::create(move(background_images), StyleValueList::Separator::Comma),
@ -2944,6 +2946,7 @@ RefPtr<StyleValue> Parser::parse_background_value(Vector<ComponentValue> const&
background_clip = background_origin;
}
transaction.commit();
return make_background_shorthand(
background_color.release_nonnull(),
background_image.release_nonnull(),
@ -5744,7 +5747,7 @@ Parser::ParseErrorOr<NonnullRefPtr<StyleValue>> Parser::parse_css_value(Property
return parsed_value.release_nonnull();
return ParseError::SyntaxError;
case PropertyID::Background:
if (auto parsed_value = parse_background_value(component_values))
if (auto parsed_value = parse_background_value(tokens); parsed_value && !tokens.has_next_token())
return parsed_value.release_nonnull();
return ParseError::SyntaxError;
case PropertyID::BackgroundAttachment:

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

@ -227,7 +227,7 @@ private:
RefPtr<StyleValue> parse_simple_comma_separated_value_list(PropertyID, TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_aspect_ratio_value(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_background_value(Vector<ComponentValue> const&);
RefPtr<StyleValue> parse_background_value(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_single_background_position_x_or_y_value(TokenStream<ComponentValue>&, PropertyID);
RefPtr<StyleValue> parse_single_background_repeat_value(TokenStream<ComponentValue>&);
RefPtr<StyleValue> parse_single_background_size_value(TokenStream<ComponentValue>&);