From 611a209756da82c6c483b5cb2e2b8ca00dcd5a8d Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 31 Mar 2022 14:36:12 +0100 Subject: [PATCH] LibWeb: Rename StyleDeclarationRule -> Declaration This is the term used in the CSS specs. --- .../Parser/{StyleDeclarationRule.h => Declaration.h} | 6 +++--- .../Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.h | 8 ++++---- Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp | 8 ++++---- Userland/Libraries/LibWeb/CSS/Parser/Parser.h | 8 ++++---- Userland/Libraries/LibWeb/CSS/Parser/StyleRules.cpp | 10 +++++----- Userland/Libraries/LibWeb/CSS/Supports.h | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) rename Userland/Libraries/LibWeb/CSS/Parser/{StyleDeclarationRule.h => Declaration.h} (84%) diff --git a/Userland/Libraries/LibWeb/CSS/Parser/StyleDeclarationRule.h b/Userland/Libraries/LibWeb/CSS/Parser/Declaration.h similarity index 84% rename from Userland/Libraries/LibWeb/CSS/Parser/StyleDeclarationRule.h rename to Userland/Libraries/LibWeb/CSS/Parser/Declaration.h index 5110481abf..f478b48964 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/StyleDeclarationRule.h +++ b/Userland/Libraries/LibWeb/CSS/Parser/Declaration.h @@ -13,12 +13,12 @@ namespace Web::CSS { -class StyleDeclarationRule { +class Declaration { friend class Parser; public: - StyleDeclarationRule(); - ~StyleDeclarationRule(); + Declaration(); + ~Declaration(); String to_string() const; diff --git a/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.h b/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.h index 3574d61dd9..1c3b5502a1 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.h +++ b/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #include namespace Web::CSS { @@ -16,7 +16,7 @@ class DeclarationOrAtRule { public: explicit DeclarationOrAtRule(RefPtr at); - explicit DeclarationOrAtRule(StyleDeclarationRule declaration); + explicit DeclarationOrAtRule(Declaration declaration); ~DeclarationOrAtRule(); enum class DeclarationType { @@ -33,7 +33,7 @@ public: return *m_at; } - StyleDeclarationRule const& declaration() const + Declaration const& declaration() const { VERIFY(is_declaration()); return m_declaration; @@ -44,7 +44,7 @@ public: private: DeclarationType m_type; RefPtr m_at; - StyleDeclarationRule m_declaration; + Declaration m_declaration; }; } diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index 3509b711f1..421e51bcb7 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -1909,7 +1909,7 @@ NonnullRefPtr Parser::consume_a_function(TokenStream& toke // 5.4.6. Consume a declaration // https://www.w3.org/TR/css-syntax-3/#consume-declaration template -Optional Parser::consume_a_declaration(TokenStream& tokens) +Optional Parser::consume_a_declaration(TokenStream& tokens) { // Note: This algorithm assumes that the next input token has already been checked to // be an . @@ -1930,7 +1930,7 @@ Optional Parser::consume_a_declaration(TokenStream& tok // Create a new declaration with its name set to the value of the current input token // and its value initially set to the empty list. - StyleDeclarationRule declaration; + Declaration declaration; declaration.m_name = ((Token)token).ident(); // 1. While the next input token is a , consume the next input token. @@ -2170,7 +2170,7 @@ Optional Parser::parse_as_supports_condition() // 5.3.6. Parse a declaration // https://www.w3.org/TR/css-syntax-3/#parse-a-declaration template -Optional Parser::parse_a_declaration(TokenStream& tokens) +Optional Parser::parse_a_declaration(TokenStream& tokens) { // To parse a declaration from input: @@ -2513,7 +2513,7 @@ RefPtr Parser::convert_to_style_declaration(V return PropertyOwningCSSStyleDeclaration::create(move(properties), move(custom_properties)); } -Optional Parser::convert_to_style_property(StyleDeclarationRule const& declaration) +Optional Parser::convert_to_style_property(Declaration const& declaration) { auto& property_name = declaration.m_name; auto property_id = property_id_from_string(property_name); diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h index 448927dcee..464dece70a 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h @@ -16,9 +16,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -139,7 +139,7 @@ private: // "Parse a declaration" is used in @supports conditions. [CSS3-CONDITIONAL] template - Optional parse_a_declaration(TokenStream&); + Optional parse_a_declaration(TokenStream&); template Vector parse_a_style_blocks_contents(TokenStream&); @@ -192,7 +192,7 @@ private: template [[nodiscard]] Vector consume_a_list_of_declarations(TokenStream&); template - Optional consume_a_declaration(TokenStream&); + Optional consume_a_declaration(TokenStream&); template [[nodiscard]] ComponentValue consume_a_component_value(TokenStream&); template @@ -206,7 +206,7 @@ private: RefPtr convert_to_rule(NonnullRefPtr); RefPtr convert_to_style_declaration(Vector declarations); - Optional convert_to_style_property(StyleDeclarationRule const&); + Optional convert_to_style_property(Declaration const&); class Dimension { public: diff --git a/Userland/Libraries/LibWeb/CSS/Parser/StyleRules.cpp b/Userland/Libraries/LibWeb/CSS/Parser/StyleRules.cpp index 437f9e9fa8..fdbb112c5b 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/StyleRules.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/StyleRules.cpp @@ -6,9 +6,9 @@ */ #include +#include #include #include -#include #include #include #include @@ -20,7 +20,7 @@ DeclarationOrAtRule::DeclarationOrAtRule(RefPtr at) , m_at(move(at)) { } -DeclarationOrAtRule::DeclarationOrAtRule(StyleDeclarationRule declaration) +DeclarationOrAtRule::DeclarationOrAtRule(Declaration declaration) : m_type(DeclarationType::Declaration) , m_declaration(move(declaration)) { @@ -50,8 +50,8 @@ ComponentValue::ComponentValue(NonnullRefPtr block) } ComponentValue::~ComponentValue() = default; -StyleDeclarationRule::StyleDeclarationRule() = default; -StyleDeclarationRule::~StyleDeclarationRule() = default; +Declaration::Declaration() = default; +Declaration::~Declaration() = default; StyleFunctionRule::StyleFunctionRule(String name) : m_name(move(name)) @@ -146,7 +146,7 @@ String ComponentValue::to_debug_string() const }); } -String StyleDeclarationRule::to_string() const +String Declaration::to_string() const { StringBuilder builder; diff --git a/Userland/Libraries/LibWeb/CSS/Supports.h b/Userland/Libraries/LibWeb/CSS/Supports.h index e7b6fa2264..160b8287da 100644 --- a/Userland/Libraries/LibWeb/CSS/Supports.h +++ b/Userland/Libraries/LibWeb/CSS/Supports.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include namespace Web::CSS {