diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index 5dd5a1fee6..b26d81bd46 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -1909,20 +1909,19 @@ Optional Parser::consume_a_declaration(TokenStream& tokens) { // Note: This algorithm assumes that the next input token has already been checked to // be an . + // NOTE: This is not true in our implementation! For convenience, we both skip whitespace + // and gracefully handle the first token not being an . // To consume a declaration: // Consume the next input token. + auto transaction = tokens.begin_transaction(); tokens.skip_whitespace(); - auto start_position = tokens.position(); auto& token = tokens.next_token(); - // Note: Not to spec, handle the case where the input token *isn't* an . - // FIXME: Perform this check before calling consume_a_declaration(). - if (!token.is(Token::Type::Ident)) { - tokens.rewind_to_position(start_position); + // NOTE: Not to spec, handle the case where the input token *isn't* an . + if (!token.is(Token::Type::Ident)) return {}; - } // Create a new declaration with its name set to the value of the current input token // and its value initially set to the empty list. @@ -1939,7 +1938,6 @@ Optional Parser::consume_a_declaration(TokenStream& tokens) auto& maybe_colon = tokens.peek_token(); if (!maybe_colon.is(Token::Type::Colon)) { log_parse_error(); - tokens.rewind_to_position(start_position); return {}; } // Otherwise, consume the next input token. @@ -2007,6 +2005,7 @@ Optional Parser::consume_a_declaration(TokenStream& tokens) } // 7. Return the declaration. + transaction.commit(); return Declaration { move(declaration_name), move(declaration_values), move(declaration_important) }; } @@ -2674,34 +2673,32 @@ Optional Parser::parse_length(ComponentValue const& component_value) Optional Parser::parse_ratio(TokenStream& tokens) { - auto position = tokens.position(); + auto transaction = tokens.begin_transaction(); tokens.skip_whitespace(); - auto error = [&]() -> Optional { - tokens.rewind_to_position(position); - return {}; - }; - // ` = [ / ]?` // FIXME: I think either part is allowed to be calc(), which makes everything complicated. auto first_number = tokens.next_token(); if (!first_number.is(Token::Type::Number) || first_number.token().number_value() < 0) - return error(); + return {}; - auto position_after_first_number = tokens.position(); - - tokens.skip_whitespace(); - auto solidus = tokens.next_token(); - tokens.skip_whitespace(); - auto second_number = tokens.next_token(); - if (solidus.is(Token::Type::Delim) && solidus.token().delim() == '/' - && second_number.is(Token::Type::Number) && second_number.token().number_value() > 0) { - // Two-value ratio - return Ratio { static_cast(first_number.token().number_value()), static_cast(second_number.token().number_value()) }; + { + auto two_value_transaction = tokens.begin_transaction(); + tokens.skip_whitespace(); + auto solidus = tokens.next_token(); + tokens.skip_whitespace(); + auto second_number = tokens.next_token(); + if (solidus.is(Token::Type::Delim) && solidus.token().delim() == '/' + && second_number.is(Token::Type::Number) && second_number.token().number_value() > 0) { + // Two-value ratio + two_value_transaction.commit(); + transaction.commit(); + return Ratio { static_cast(first_number.token().number_value()), static_cast(second_number.token().number_value()) }; + } } // Single-value ratio - tokens.rewind_to_position(position_after_first_number); + transaction.commit(); return Ratio { static_cast(first_number.token().number_value()) }; } @@ -3411,17 +3408,16 @@ RefPtr Parser::parse_background_value(Vector const& background_position = maybe_background_position.release_nonnull(); // Attempt to parse `/ ` - auto before_slash = tokens.position(); + auto transaction = tokens.begin_transaction(); auto& maybe_slash = tokens.next_token(); if (maybe_slash.is(Token::Type::Delim) && maybe_slash.token().delim() == '/') { if (auto maybe_background_size = parse_single_background_size_value(tokens)) { + transaction.commit(); background_size = maybe_background_size.release_nonnull(); continue; } return nullptr; } - - tokens.rewind_to_position(before_slash); continue; } return nullptr; @@ -3501,11 +3497,7 @@ RefPtr Parser::parse_single_background_position_value(TokenStream later. - auto start_position = tokens.position(); - auto error = [&]() { - tokens.rewind_to_position(start_position); - return nullptr; - }; + auto transaction = tokens.begin_transaction(); auto to_edge = [](ValueID identifier) -> Optional { switch (identifier) { @@ -3573,7 +3565,7 @@ RefPtr Parser::parse_single_background_position_value(TokenStreamas_percentage().percentage(), false, true }; } else { - return error(); + return nullptr; } continue; } @@ -3584,7 +3576,7 @@ RefPtr Parser::parse_single_background_position_value(TokenStreamto_length(), false, true }; } else { - return error(); + return nullptr; } continue; } @@ -3618,7 +3610,7 @@ RefPtr Parser::parse_single_background_position_value(TokenStream Parser::parse_single_background_position_value(TokenStream Parser::parse_single_background_position_value(TokenStream `: // The loop above reads this pattern as a single EdgeOffset, when actually, it should be treated @@ -3660,6 +3652,7 @@ RefPtr Parser::parse_single_background_position_value(TokenStreamedge, horizontal->offset, vertical->edge, vertical->offset); @@ -3667,11 +3660,7 @@ RefPtr Parser::parse_single_background_position_value(TokenStream Parser::parse_single_background_repeat_value(TokenStream& tokens) { - auto start_position = tokens.position(); - auto error = [&]() { - tokens.rewind_to_position(start_position); - return nullptr; - }; + auto transaction = tokens.begin_transaction(); auto is_directional_repeat = [](StyleValue const& value) -> bool { auto value_id = value.to_identifier(); @@ -3696,11 +3685,12 @@ RefPtr Parser::parse_single_background_repeat_value(TokenStreamto_identifier(); + transaction.commit(); return BackgroundRepeatStyleValue::create( value_id == ValueID::RepeatX ? Repeat::Repeat : Repeat::NoRepeat, value_id == ValueID::RepeatX ? Repeat::NoRepeat : Repeat::Repeat); @@ -3711,22 +3701,20 @@ RefPtr Parser::parse_single_background_repeat_value(TokenStreamto_identifier()), as_repeat(x_value->to_identifier())); } tokens.next_token(); auto y_value = maybe_y_value.release_nonnull(); if (is_directional_repeat(*y_value)) - return error(); + return nullptr; + transaction.commit(); return BackgroundRepeatStyleValue::create(as_repeat(x_value->to_identifier()), as_repeat(y_value->to_identifier())); } RefPtr Parser::parse_single_background_size_value(TokenStream& tokens) { - auto start_position = tokens.position(); - auto error = [&]() { - tokens.rewind_to_position(start_position); - return nullptr; - }; + auto transaction = tokens.begin_transaction(); auto get_length_percentage = [](StyleValue& style_value) -> Optional { if (style_value.is_percentage()) @@ -3738,7 +3726,7 @@ RefPtr Parser::parse_single_background_size_value(TokenStreamto_identifier() == ValueID::Cover || x_value->to_identifier() == ValueID::Contain) @@ -3748,19 +3736,22 @@ RefPtr Parser::parse_single_background_size_value(TokenStream Parser::parse_border_value(Vector const& component_values) @@ -3927,11 +3918,7 @@ RefPtr Parser::parse_shadow_value(Vector const& comp RefPtr Parser::parse_single_shadow_value(TokenStream& tokens, AllowInsetKeyword allow_inset_keyword) { - auto start_position = tokens.position(); - auto error = [&]() { - tokens.rewind_to_position(start_position); - return nullptr; - }; + auto transaction = tokens.begin_transaction(); Optional color; Optional offset_x; @@ -3945,7 +3932,7 @@ RefPtr Parser::parse_single_shadow_value(TokenStream if (auto maybe_color = parse_color(token); maybe_color.has_value()) { if (color.has_value()) - return error(); + return nullptr; color = maybe_color.release_value(); tokens.next_token(); continue; @@ -3954,16 +3941,16 @@ RefPtr Parser::parse_single_shadow_value(TokenStream if (auto maybe_offset_x = parse_length(token); maybe_offset_x.has_value()) { // horizontal offset if (offset_x.has_value()) - return error(); + return nullptr; offset_x = maybe_offset_x.release_value(); tokens.next_token(); // vertical offset if (!tokens.has_next_token()) - return error(); + return nullptr; auto maybe_offset_y = parse_length(tokens.peek_token()); if (!maybe_offset_y.has_value()) - return error(); + return nullptr; offset_y = maybe_offset_y.release_value(); tokens.next_token(); @@ -3991,7 +3978,7 @@ RefPtr Parser::parse_single_shadow_value(TokenStream if (allow_inset_keyword == AllowInsetKeyword::Yes && token.is(Token::Type::Ident) && token.token().ident().equals_ignoring_case("inset"sv)) { if (placement.has_value()) - return error(); + return nullptr; placement = ShadowPlacement::Inner; tokens.next_token(); continue; @@ -4000,7 +3987,7 @@ RefPtr Parser::parse_single_shadow_value(TokenStream if (token.is(Token::Type::Comma)) break; - return error(); + return nullptr; } // FIXME: If color is absent, default to `currentColor` @@ -4009,7 +3996,7 @@ RefPtr Parser::parse_single_shadow_value(TokenStream // x/y offsets are required if (!offset_x.has_value() || !offset_y.has_value()) - return error(); + return nullptr; // Other lengths default to 0 if (!blur_radius.has_value()) @@ -4021,6 +4008,7 @@ RefPtr Parser::parse_single_shadow_value(TokenStream if (!placement.has_value()) placement = ShadowPlacement::Outer; + transaction.commit(); return ShadowStyleValue::create(color.release_value(), offset_x.release_value(), offset_y.release_value(), blur_radius.release_value(), spread_distance.release_value(), placement.release_value()); }