From add6babef4a9dde7447d96ed65aa295a361bdc79 Mon Sep 17 00:00:00 2001
From: Sam Atkins <atkinssj@serenityos.org>
Date: Tue, 12 Apr 2022 14:51:19 +0100
Subject: [PATCH] LibWeb: Move Declaration and DeclarationOrAtRule into Parser
 namespace

---
 Userland/Libraries/LibWeb/CSS/Parser/Declaration.cpp      | 2 +-
 Userland/Libraries/LibWeb/CSS/Parser/Declaration.h        | 8 ++++----
 .../Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.cpp   | 2 +-
 .../Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.h     | 4 ++--
 Userland/Libraries/LibWeb/Forward.h                       | 2 ++
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Declaration.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Declaration.cpp
index 6388d36c1db..6225bb67227 100644
--- a/Userland/Libraries/LibWeb/CSS/Parser/Declaration.cpp
+++ b/Userland/Libraries/LibWeb/CSS/Parser/Declaration.cpp
@@ -8,7 +8,7 @@
 #include <LibWeb/CSS/Parser/Declaration.h>
 #include <LibWeb/CSS/Serialize.h>
 
-namespace Web::CSS {
+namespace Web::CSS::Parser {
 
 Declaration::Declaration() = default;
 Declaration::~Declaration() = default;
diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Declaration.h b/Userland/Libraries/LibWeb/CSS/Parser/Declaration.h
index 45af2a799c0..e180b7d197a 100644
--- a/Userland/Libraries/LibWeb/CSS/Parser/Declaration.h
+++ b/Userland/Libraries/LibWeb/CSS/Parser/Declaration.h
@@ -11,24 +11,24 @@
 #include <LibWeb/CSS/CSSStyleDeclaration.h>
 #include <LibWeb/CSS/Parser/ComponentValue.h>
 
-namespace Web::CSS {
+namespace Web::CSS::Parser {
 
 class Declaration {
-    friend class Parser::Parser;
+    friend class Parser;
 
 public:
     Declaration();
     ~Declaration();
 
     String const& name() const { return m_name; }
-    Vector<Parser::ComponentValue> const& values() const { return m_values; }
+    Vector<ComponentValue> const& values() const { return m_values; }
     Important importance() const { return m_important; }
 
     String to_string() const;
 
 private:
     String m_name;
-    Vector<Parser::ComponentValue> m_values;
+    Vector<ComponentValue> m_values;
     Important m_important { Important::No };
 };
 
diff --git a/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.cpp b/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.cpp
index 637a96255ae..1094b921a17 100644
--- a/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.cpp
+++ b/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.cpp
@@ -7,7 +7,7 @@
 
 #include <LibWeb/CSS/Parser/DeclarationOrAtRule.h>
 
-namespace Web::CSS {
+namespace Web::CSS::Parser {
 
 DeclarationOrAtRule::DeclarationOrAtRule(RefPtr<StyleRule> at)
     : m_type(DeclarationType::At)
diff --git a/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.h b/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.h
index ed271a9e269..7c8f61672eb 100644
--- a/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.h
+++ b/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.h
@@ -9,10 +9,10 @@
 #include <LibWeb/CSS/Parser/Declaration.h>
 #include <LibWeb/CSS/Parser/StyleRule.h>
 
-namespace Web::CSS {
+namespace Web::CSS::Parser {
 
 class DeclarationOrAtRule {
-    friend class Parser::Parser;
+    friend class Parser;
 
 public:
     explicit DeclarationOrAtRule(RefPtr<StyleRule> at);
diff --git a/Userland/Libraries/LibWeb/Forward.h b/Userland/Libraries/LibWeb/Forward.h
index 848939d4d1e..4e5dd391fd1 100644
--- a/Userland/Libraries/LibWeb/Forward.h
+++ b/Userland/Libraries/LibWeb/Forward.h
@@ -101,6 +101,8 @@ enum class ValueID;
 namespace Web::CSS::Parser {
 class Block;
 class ComponentValue;
+class Declaration;
+class DeclarationOrAtRule;
 class Function;
 class Parser;
 }