From f078bb8294b946e5d8b762d815a2725aa1300e43 Mon Sep 17 00:00:00 2001
From: Sam Atkins <atkinssj@serenityos.org>
Date: Wed, 23 Mar 2022 16:59:44 +0000
Subject: LibWeb: Implement disallowing `inset` when parsing shadows

`text-shadow` does not support this, so this way we can still use the
same parsing code.

It's OK that we still assign a ShadowPlacement value to the
ShadowStyleValue, since it will just get ignored when painting
text-shadows, but if it appears in the property value then that is a
syntax error.
---
 Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp | 13 +++++++------
 Userland/Libraries/LibWeb/CSS/Parser/Parser.h   |  8 ++++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'Userland/Libraries/LibWeb')

diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
index 3f5d927d3d..70e69133b1 100644
--- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
+++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
@@ -3318,7 +3318,7 @@ RefPtr<StyleValue> Parser::parse_border_radius_shorthand_value(Vector<StyleCompo
     return StyleValueList::create(move(border_radii), StyleValueList::Separator::Space);
 }
 
-RefPtr<StyleValue> Parser::parse_shadow_value(Vector<StyleComponentValueRule> const& component_values)
+RefPtr<StyleValue> Parser::parse_shadow_value(Vector<StyleComponentValueRule> const& component_values, AllowInsetKeyword allow_inset_keyword)
 {
     // "none"
     if (component_values.size() == 1 && component_values.first().is(Token::Type::Ident)) {
@@ -3327,12 +3327,12 @@ RefPtr<StyleValue> Parser::parse_shadow_value(Vector<StyleComponentValueRule> co
             return ident;
     }
 
-    return parse_comma_separated_value_list(component_values, [this](auto& tokens) {
-        return parse_single_shadow_value(tokens);
+    return parse_comma_separated_value_list(component_values, [this, allow_inset_keyword](auto& tokens) {
+        return parse_single_shadow_value(tokens, allow_inset_keyword);
     });
 }
 
-RefPtr<StyleValue> Parser::parse_single_shadow_value(TokenStream<StyleComponentValueRule>& tokens)
+RefPtr<StyleValue> Parser::parse_single_shadow_value(TokenStream<StyleComponentValueRule>& tokens, AllowInsetKeyword allow_inset_keyword)
 {
     auto start_position = tokens.position();
     auto error = [&]() {
@@ -3395,7 +3395,8 @@ RefPtr<StyleValue> Parser::parse_single_shadow_value(TokenStream<StyleComponentV
             continue;
         }
 
-        if (token.is(Token::Type::Ident) && token.token().ident().equals_ignoring_case("inset"sv)) {
+        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();
             placement = ShadowPlacement::Inner;
@@ -4248,7 +4249,7 @@ Result<NonnullRefPtr<StyleValue>, Parser::ParsingResult> Parser::parse_css_value
             return parsed_value.release_nonnull();
         return ParsingResult::SyntaxError;
     case PropertyID::BoxShadow:
-        if (auto parsed_value = parse_shadow_value(component_values))
+        if (auto parsed_value = parse_shadow_value(component_values, AllowInsetKeyword::Yes))
             return parsed_value.release_nonnull();
         return ParsingResult::SyntaxError;
     case PropertyID::Content:
diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h
index 9bb5114a91..d3d13cb10f 100644
--- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h
+++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h
@@ -294,8 +294,12 @@ private:
     RefPtr<StyleValue> parse_font_family_value(Vector<StyleComponentValueRule> const&, size_t start_index = 0);
     RefPtr<StyleValue> parse_list_style_value(Vector<StyleComponentValueRule> const&);
     RefPtr<StyleValue> parse_overflow_value(Vector<StyleComponentValueRule> const&);
-    RefPtr<StyleValue> parse_shadow_value(Vector<StyleComponentValueRule> const&);
-    RefPtr<StyleValue> parse_single_shadow_value(TokenStream<StyleComponentValueRule>&);
+    enum class AllowInsetKeyword {
+        No,
+        Yes,
+    };
+    RefPtr<StyleValue> parse_shadow_value(Vector<StyleComponentValueRule> const&, AllowInsetKeyword);
+    RefPtr<StyleValue> parse_single_shadow_value(TokenStream<StyleComponentValueRule>&, AllowInsetKeyword);
     RefPtr<StyleValue> parse_text_decoration_value(Vector<StyleComponentValueRule> const&);
     RefPtr<StyleValue> parse_transform_value(Vector<StyleComponentValueRule> const&);
     RefPtr<StyleValue> parse_transform_origin_value(Vector<StyleComponentValueRule> const&);
-- 
cgit v1.2.3