From eb83d2617caa437bfebdb00967bc71c760d1a3a5 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Tue, 28 Sep 2021 16:18:20 +0100 Subject: [PATCH] LibWeb: Use a CSSRuleList inside CSSStyleSheet This better matches the spec. :^) --- Userland/Libraries/LibWeb/CSS/CSSStyleSheet.h | 7 ++++--- Userland/Libraries/LibWeb/Dump.cpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Userland/Libraries/LibWeb/CSS/CSSStyleSheet.h b/Userland/Libraries/LibWeb/CSS/CSSStyleSheet.h index 3c701ae228..68c1cf83b4 100644 --- a/Userland/Libraries/LibWeb/CSS/CSSStyleSheet.h +++ b/Userland/Libraries/LibWeb/CSS/CSSStyleSheet.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -28,8 +29,8 @@ public: virtual String type() const override { return "text/css"; } - const NonnullRefPtrVector& rules() const { return m_rules; } - NonnullRefPtrVector& rules() { return m_rules; } + CSSRuleList const& rules() const { return m_rules; } + CSSRuleList& rules() { return m_rules; } template void for_each_effective_style_rule(Callback callback) const @@ -66,7 +67,7 @@ public: private: explicit CSSStyleSheet(NonnullRefPtrVector); - NonnullRefPtrVector m_rules; + CSSRuleList m_rules; }; } diff --git a/Userland/Libraries/LibWeb/Dump.cpp b/Userland/Libraries/LibWeb/Dump.cpp index 2e63a57bc4..358c253b36 100644 --- a/Userland/Libraries/LibWeb/Dump.cpp +++ b/Userland/Libraries/LibWeb/Dump.cpp @@ -523,7 +523,7 @@ void dump_sheet(StringBuilder& builder, CSS::StyleSheet const& sheet) { auto& css_stylesheet = verify_cast(sheet); - builder.appendff("CSSStyleSheet{{{}}}: {} rule(s)\n", &sheet, css_stylesheet.rules().size()); + builder.appendff("CSSStyleSheet{{{}}}: {} rule(s)\n", &sheet, css_stylesheet.rules().length()); for (auto& rule : css_stylesheet.rules()) { dump_rule(builder, rule);