Преглед на файлове

LibWeb: Parse overflow property using TokenStream

Also simplify it a bit. We don't need to handle 1 / 2 values separately,
but past Sam didn't realise that.
Sam Atkins преди 1 година
родител
ревизия
4f773a7dae
променени са 2 файла, в които са добавени 13 реда и са изтрити 20 реда
  1. 12 19
      Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
  2. 1 1
      Userland/Libraries/LibWeb/CSS/Parser/Parser.h

+ 12 - 19
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp

@@ -4492,29 +4492,22 @@ RefPtr<StyleValue> Parser::parse_math_depth_value(TokenStream<ComponentValue>& t
     return nullptr;
 }
 
-RefPtr<StyleValue> Parser::parse_overflow_value(Vector<ComponentValue> const& component_values)
+RefPtr<StyleValue> Parser::parse_overflow_value(TokenStream<ComponentValue>& tokens)
 {
-    auto tokens = TokenStream { component_values };
-    if (component_values.size() == 1) {
-        auto maybe_value = parse_css_value_for_property(PropertyID::Overflow, tokens);
-        if (!maybe_value)
-            return nullptr;
-        return ShorthandStyleValue::create(PropertyID::Overflow,
-            { PropertyID::OverflowX, PropertyID::OverflowY },
-            { *maybe_value, *maybe_value });
-    }
-
-    if (component_values.size() == 2) {
-        auto maybe_x_value = parse_css_value_for_property(PropertyID::OverflowX, tokens);
-        auto maybe_y_value = parse_css_value_for_property(PropertyID::OverflowY, tokens);
-        if (!maybe_x_value || !maybe_y_value)
-            return nullptr;
+    auto transaction = tokens.begin_transaction();
+    auto maybe_x_value = parse_css_value_for_property(PropertyID::OverflowX, tokens);
+    if (!maybe_x_value)
+        return nullptr;
+    auto maybe_y_value = parse_css_value_for_property(PropertyID::OverflowY, tokens);
+    transaction.commit();
+    if (maybe_y_value) {
         return ShorthandStyleValue::create(PropertyID::Overflow,
             { PropertyID::OverflowX, PropertyID::OverflowY },
             { maybe_x_value.release_nonnull(), maybe_y_value.release_nonnull() });
     }
-
-    return nullptr;
+    return ShorthandStyleValue::create(PropertyID::Overflow,
+        { PropertyID::OverflowX, PropertyID::OverflowY },
+        { *maybe_x_value, *maybe_x_value });
 }
 
 RefPtr<StyleValue> Parser::parse_place_content_value(Vector<ComponentValue> const& component_values)
@@ -5915,7 +5908,7 @@ Parser::ParseErrorOr<NonnullRefPtr<StyleValue>> Parser::parse_css_value(Property
             return parsed_value.release_nonnull();
         return ParseError::SyntaxError;
     case PropertyID::Overflow:
-        if (auto parsed_value = parse_overflow_value(component_values))
+        if (auto parsed_value = parse_overflow_value(tokens); parsed_value && !tokens.has_next_token())
             return parsed_value.release_nonnull();
         return ParseError::SyntaxError;
     case PropertyID::PlaceContent:

+ 1 - 1
Userland/Libraries/LibWeb/CSS/Parser/Parser.h

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