LibWeb: Add 'Attribute' as a CSS SimpleSelector::Type

Previously, SimpleSelectors optionally had Attribute-selector data
as well as their main type. Now, they're either one or the other,
which better matches the spec, and makes parsing and matching more
straightforward.

1 files changed, 17 insertions, 13 deletions

diff --git a/Userland/Libraries/LibWeb/CSS/Selector.h b/Userland/Libraries/LibWeb/CSS/Selector.h
index 7bed123dd0..ab19ce156d 100644
--- a/Userland/Libraries/LibWeb/CSS/Selector.h
+++ b/Userland/Libraries/LibWeb/CSS/Selector.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
+ * Copyright (c) 2021, Sam Atkins <atkinssj@gmail.com>
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
@@ -21,6 +22,7 @@ public:
             TagName,
             Id,
             Class,
+            Attribute,
         };
         Type type { Type::Invalid };
 
@@ -56,20 +58,22 @@ public:
 
         FlyString value;
 
-        enum class AttributeMatchType {
-            None,
-            HasAttribute,
-            ExactValueMatch,
-            ContainsWord,      // [att~=val]
-            ContainsString,    // [att*=val]
-            StartsWithSegment, // [att|=val]
-            StartsWithString,  // [att^=val]
-            EndsWithString,    // [att$=val]
+        struct Attribute {
+            enum class MatchType {
+                None,
+                HasAttribute,
+                ExactValueMatch,
+                ContainsWord,      // [att~=val]
+                ContainsString,    // [att*=val]
+                StartsWithSegment, // [att|=val]
+                StartsWithString,  // [att^=val]
+                EndsWithString,    // [att$=val]
+            };
+            MatchType match_type { MatchType::None };
+            FlyString name;
+            String value;
         };
-
-        AttributeMatchType attribute_match_type { AttributeMatchType::None };
-        FlyString attribute_name;
-        String attribute_value;
+        Attribute attribute;
 
         struct NthChildPattern {
             int step_size = 0;