From 98963e0c9ac5eb7eb84e28e4199baea8864156fe Mon Sep 17 00:00:00 2001
From: Sam Atkins <atkinssj@gmail.com>
Date: Fri, 9 Aug 2024 11:30:58 +0100
Subject: [PATCH] LibWeb/CSS: Flatten parse_basic_shape_function() into only
 caller

---
 Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp | 14 ++++----------
 Userland/Libraries/LibWeb/CSS/Parser/Parser.h   |  1 -
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
index ed4d9f154d5..66d36d08b70 100644
--- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
+++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
@@ -1199,8 +1199,10 @@ RefPtr<StyleValue> Parser::parse_url_value(TokenStream<ComponentValue>& tokens)
     return URLStyleValue::create(*url);
 }
 
-RefPtr<StyleValue> Parser::parse_basic_shape_function(ComponentValue const& component_value)
+RefPtr<StyleValue> Parser::parse_basic_shape_value(TokenStream<ComponentValue>& tokens)
 {
+    auto transaction = tokens.begin_transaction();
+    auto& component_value = tokens.next_token();
     if (!component_value.is_function())
         return nullptr;
 
@@ -1236,18 +1238,10 @@ RefPtr<StyleValue> Parser::parse_basic_shape_function(ComponentValue const& comp
         points.append(Polygon::Point { *x_pos, *y_pos });
     }
 
+    transaction.commit();
     return BasicShapeStyleValue::create(Polygon { FillRule::Nonzero, move(points) });
 }
 
-RefPtr<StyleValue> Parser::parse_basic_shape_value(TokenStream<ComponentValue>& tokens)
-{
-    auto basic_shape = parse_basic_shape_function(tokens.peek_token());
-    if (!basic_shape)
-        return nullptr;
-    (void)tokens.next_token();
-    return basic_shape;
-}
-
 CSSRule* Parser::convert_to_rule(NonnullRefPtr<Rule> rule)
 {
     if (rule->is_at_rule()) {
diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h
index 891edfb6ad6..11207d11ab6 100644
--- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h
+++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h
@@ -260,7 +260,6 @@ private:
     Optional<URL::URL> parse_url_function(ComponentValue const&);
     RefPtr<StyleValue> parse_url_value(TokenStream<ComponentValue>&);
 
-    RefPtr<StyleValue> parse_basic_shape_function(ComponentValue const&);
     RefPtr<StyleValue> parse_basic_shape_value(TokenStream<ComponentValue>&);
 
     template<typename TElement>