From 0af476266200a707770959173c9e7e2028235119 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 7 Mar 2021 15:00:02 +0100 Subject: [PATCH] LibWeb: Rename StyleRule => CSSStyleRule This matches the CSSOM specification. --- Userland/Libraries/LibWeb/CMakeLists.txt | 2 +- .../CSS/{StyleRule.cpp => CSSStyleRule.cpp} | 6 +++--- .../LibWeb/CSS/{StyleRule.h => CSSStyleRule.h} | 16 ++++++++-------- .../Libraries/LibWeb/CSS/Parser/CSSParser.cpp | 4 ++-- .../Libraries/LibWeb/CSS/StyleInvalidator.cpp | 2 +- Userland/Libraries/LibWeb/CSS/StyleResolver.cpp | 2 +- Userland/Libraries/LibWeb/CSS/StyleResolver.h | 2 +- Userland/Libraries/LibWeb/CSS/StyleSheet.h | 2 +- Userland/Libraries/LibWeb/Dump.cpp | 6 +++--- Userland/Libraries/LibWeb/Dump.h | 2 +- Userland/Libraries/LibWeb/Forward.h | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) rename Userland/Libraries/LibWeb/CSS/{StyleRule.cpp => CSSStyleRule.cpp} (89%) rename Userland/Libraries/LibWeb/CSS/{StyleRule.h => CSSStyleRule.h} (80%) diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index a1aed67271..23d18de374 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -11,6 +11,7 @@ set(SOURCES Bindings/Wrappable.cpp CSS/CSSImportRule.cpp CSS/CSSRule.cpp + CSS/CSSStyleRule.cpp CSS/DefaultStyleSheetSource.cpp CSS/Length.cpp CSS/Parser/CSSParser.cpp @@ -23,7 +24,6 @@ set(SOURCES CSS/StyleInvalidator.cpp CSS/StyleProperties.cpp CSS/StyleResolver.cpp - CSS/StyleRule.cpp CSS/StyleSheet.cpp CSS/StyleSheetList.cpp CSS/StyleValue.cpp diff --git a/Userland/Libraries/LibWeb/CSS/StyleRule.cpp b/Userland/Libraries/LibWeb/CSS/CSSStyleRule.cpp similarity index 89% rename from Userland/Libraries/LibWeb/CSS/StyleRule.cpp rename to Userland/Libraries/LibWeb/CSS/CSSStyleRule.cpp index d92f362500..daaf83d467 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleRule.cpp +++ b/Userland/Libraries/LibWeb/CSS/CSSStyleRule.cpp @@ -24,17 +24,17 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include namespace Web::CSS { -StyleRule::StyleRule(Vector&& selectors, NonnullRefPtr&& declaration) +CSSStyleRule::CSSStyleRule(Vector&& selectors, NonnullRefPtr&& declaration) : m_selectors(move(selectors)) , m_declaration(move(declaration)) { } -StyleRule::~StyleRule() +CSSStyleRule::~CSSStyleRule() { } diff --git a/Userland/Libraries/LibWeb/CSS/StyleRule.h b/Userland/Libraries/LibWeb/CSS/CSSStyleRule.h similarity index 80% rename from Userland/Libraries/LibWeb/CSS/StyleRule.h rename to Userland/Libraries/LibWeb/CSS/CSSStyleRule.h index 8e2d3acf44..bfee3c0b6d 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleRule.h +++ b/Userland/Libraries/LibWeb/CSS/CSSStyleRule.h @@ -34,26 +34,26 @@ namespace Web::CSS { -class StyleRule : public CSSRule { - AK_MAKE_NONCOPYABLE(StyleRule); - AK_MAKE_NONMOVABLE(StyleRule); +class CSSStyleRule : public CSSRule { + AK_MAKE_NONCOPYABLE(CSSStyleRule); + AK_MAKE_NONMOVABLE(CSSStyleRule); public: - static NonnullRefPtr create(Vector&& selectors, NonnullRefPtr&& declaration) + static NonnullRefPtr create(Vector&& selectors, NonnullRefPtr&& declaration) { - return adopt(*new StyleRule(move(selectors), move(declaration))); + return adopt(*new CSSStyleRule(move(selectors), move(declaration))); } - ~StyleRule(); + ~CSSStyleRule(); const Vector& selectors() const { return m_selectors; } const StyleDeclaration& declaration() const { return m_declaration; } - virtual StringView class_name() const { return "StyleRule"; }; + virtual StringView class_name() const { return "CSSStyleRule"; }; virtual Type type() const { return Type::Style; }; private: - StyleRule(Vector&&, NonnullRefPtr&&); + CSSStyleRule(Vector&&, NonnullRefPtr&&); Vector m_selectors; NonnullRefPtr m_declaration; diff --git a/Userland/Libraries/LibWeb/CSS/Parser/CSSParser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/CSSParser.cpp index e8ed789d61..57966db36b 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/CSSParser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/CSSParser.cpp @@ -27,9 +27,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -809,7 +809,7 @@ public: return; } - rules.append(CSS::StyleRule::create(move(current_rule.selectors), CSS::StyleDeclaration::create(move(current_rule.properties)))); + rules.append(CSS::CSSStyleRule::create(move(current_rule.selectors), CSS::StyleDeclaration::create(move(current_rule.properties)))); } Optional parse_string() diff --git a/Userland/Libraries/LibWeb/CSS/StyleInvalidator.cpp b/Userland/Libraries/LibWeb/CSS/StyleInvalidator.cpp index d5d7b14ca8..41c5159d66 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleInvalidator.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleInvalidator.cpp @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include -#include #include #include diff --git a/Userland/Libraries/LibWeb/CSS/StyleResolver.cpp b/Userland/Libraries/LibWeb/CSS/StyleResolver.cpp index 544e8cc646..520108d9e7 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleResolver.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleResolver.cpp @@ -26,10 +26,10 @@ */ #include +#include #include #include #include -#include #include #include #include diff --git a/Userland/Libraries/LibWeb/CSS/StyleResolver.h b/Userland/Libraries/LibWeb/CSS/StyleResolver.h index 0dde35a261..7f407e0604 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleResolver.h +++ b/Userland/Libraries/LibWeb/CSS/StyleResolver.h @@ -34,7 +34,7 @@ namespace Web::CSS { struct MatchingRule { - RefPtr rule; + RefPtr rule; size_t style_sheet_index { 0 }; size_t rule_index { 0 }; size_t selector_index { 0 }; diff --git a/Userland/Libraries/LibWeb/CSS/StyleSheet.h b/Userland/Libraries/LibWeb/CSS/StyleSheet.h index a6ee3a1013..31004a4e35 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleSheet.h +++ b/Userland/Libraries/LibWeb/CSS/StyleSheet.h @@ -52,7 +52,7 @@ public: { for (auto& rule : m_rules) if (rule.type() == CSSRule::Type::Style) { - callback(downcast(rule)); + callback(downcast(rule)); } else if (rule.type() == CSSRule::Type::Import) { const CSSImportRule& import_rule = downcast(rule); if (import_rule.has_import_result()) diff --git a/Userland/Libraries/LibWeb/Dump.cpp b/Userland/Libraries/LibWeb/Dump.cpp index 0a2d2f8d36..f844a9a329 100644 --- a/Userland/Libraries/LibWeb/Dump.cpp +++ b/Userland/Libraries/LibWeb/Dump.cpp @@ -30,8 +30,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -405,7 +405,7 @@ void dump_rule(StringBuilder& builder, const CSS::CSSRule& rule) builder.appendff("{}:\n", rule.class_name()); switch (rule.type()) { case CSS::CSSRule::Type::Style: - dump_style_rule(builder, downcast(rule)); + dump_style_rule(builder, downcast(rule)); break; case CSS::CSSRule::Type::Import: dump_import_rule(builder, downcast(rule)); @@ -420,7 +420,7 @@ void dump_import_rule(StringBuilder& builder, const CSS::CSSImportRule& rule) builder.appendff(" Document URL: {}\n", rule.url()); } -void dump_style_rule(StringBuilder& builder, const CSS::StyleRule& rule) +void dump_style_rule(StringBuilder& builder, const CSS::CSSStyleRule& rule) { for (auto& selector : rule.selectors()) { dump_selector(builder, selector); diff --git a/Userland/Libraries/LibWeb/Dump.h b/Userland/Libraries/LibWeb/Dump.h index 48f7166bcd..e4ea033c42 100644 --- a/Userland/Libraries/LibWeb/Dump.h +++ b/Userland/Libraries/LibWeb/Dump.h @@ -40,7 +40,7 @@ void dump_sheet(StringBuilder&, const CSS::StyleSheet&); void dump_sheet(const CSS::StyleSheet&); void dump_rule(StringBuilder&, const CSS::CSSRule&); void dump_rule(const CSS::CSSRule&); -void dump_style_rule(StringBuilder&, const CSS::StyleRule&); +void dump_style_rule(StringBuilder&, const CSS::CSSStyleRule&); void dump_import_rule(StringBuilder&, const CSS::CSSImportRule&); void dump_selector(StringBuilder&, const CSS::Selector&); void dump_selector(const CSS::Selector&); diff --git a/Userland/Libraries/LibWeb/Forward.h b/Userland/Libraries/LibWeb/Forward.h index 84e704edb1..b5ccb3712d 100644 --- a/Userland/Libraries/LibWeb/Forward.h +++ b/Userland/Libraries/LibWeb/Forward.h @@ -30,12 +30,12 @@ namespace Web::CSS { class CSSRule; class CSSImportRule; +class CSSStyleRule; class Length; class Selector; class StyleDeclaration; class StyleProperties; class StyleResolver; -class StyleRule; class StyleSheet; enum class Display; }