diff options
Diffstat (limited to 'Userland/Libraries/LibWeb/CSS')
-rw-r--r-- | Userland/Libraries/LibWeb/CSS/CSSRule.h | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/CSS/CSSStyleDeclaration.cpp (renamed from Userland/Libraries/LibWeb/CSS/StyleDeclaration.cpp) | 6 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/CSS/CSSStyleDeclaration.h (renamed from Userland/Libraries/LibWeb/CSS/StyleDeclaration.h) | 10 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/CSS/CSSStyleRule.cpp | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/CSS/CSSStyleRule.h | 10 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.cpp | 10 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.h | 2 |
7 files changed, 21 insertions, 21 deletions
diff --git a/Userland/Libraries/LibWeb/CSS/CSSRule.h b/Userland/Libraries/LibWeb/CSS/CSSRule.h index de2a365252..63fa5c1868 100644 --- a/Userland/Libraries/LibWeb/CSS/CSSRule.h +++ b/Userland/Libraries/LibWeb/CSS/CSSRule.h @@ -28,8 +28,8 @@ #include <AK/RefCounted.h> #include <AK/String.h> +#include <LibWeb/CSS/CSSStyleDeclaration.h> #include <LibWeb/CSS/Selector.h> -#include <LibWeb/CSS/StyleDeclaration.h> namespace Web::CSS { diff --git a/Userland/Libraries/LibWeb/CSS/StyleDeclaration.cpp b/Userland/Libraries/LibWeb/CSS/CSSStyleDeclaration.cpp index eb56b94625..04b291298a 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleDeclaration.cpp +++ b/Userland/Libraries/LibWeb/CSS/CSSStyleDeclaration.cpp @@ -24,16 +24,16 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <LibWeb/CSS/StyleDeclaration.h> +#include <LibWeb/CSS/CSSStyleDeclaration.h> namespace Web::CSS { -StyleDeclaration::StyleDeclaration(Vector<StyleProperty>&& properties) +CSSStyleDeclaration::CSSStyleDeclaration(Vector<StyleProperty>&& properties) : m_properties(move(properties)) { } -StyleDeclaration::~StyleDeclaration() +CSSStyleDeclaration::~CSSStyleDeclaration() { } diff --git a/Userland/Libraries/LibWeb/CSS/StyleDeclaration.h b/Userland/Libraries/LibWeb/CSS/CSSStyleDeclaration.h index 787429eb15..b81b08dcdc 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleDeclaration.h +++ b/Userland/Libraries/LibWeb/CSS/CSSStyleDeclaration.h @@ -38,19 +38,19 @@ struct StyleProperty { bool important { false }; }; -class StyleDeclaration : public RefCounted<StyleDeclaration> { +class CSSStyleDeclaration : public RefCounted<CSSStyleDeclaration> { public: - static NonnullRefPtr<StyleDeclaration> create(Vector<StyleProperty>&& properties) + static NonnullRefPtr<CSSStyleDeclaration> create(Vector<StyleProperty>&& properties) { - return adopt(*new StyleDeclaration(move(properties))); + return adopt(*new CSSStyleDeclaration(move(properties))); } - ~StyleDeclaration(); + ~CSSStyleDeclaration(); const Vector<StyleProperty>& properties() const { return m_properties; } private: - explicit StyleDeclaration(Vector<StyleProperty>&&); + explicit CSSStyleDeclaration(Vector<StyleProperty>&&); Vector<StyleProperty> m_properties; }; diff --git a/Userland/Libraries/LibWeb/CSS/CSSStyleRule.cpp b/Userland/Libraries/LibWeb/CSS/CSSStyleRule.cpp index daaf83d467..72e3791deb 100644 --- a/Userland/Libraries/LibWeb/CSS/CSSStyleRule.cpp +++ b/Userland/Libraries/LibWeb/CSS/CSSStyleRule.cpp @@ -28,7 +28,7 @@ namespace Web::CSS { -CSSStyleRule::CSSStyleRule(Vector<Selector>&& selectors, NonnullRefPtr<StyleDeclaration>&& declaration) +CSSStyleRule::CSSStyleRule(Vector<Selector>&& selectors, NonnullRefPtr<CSSStyleDeclaration>&& declaration) : m_selectors(move(selectors)) , m_declaration(move(declaration)) { diff --git a/Userland/Libraries/LibWeb/CSS/CSSStyleRule.h b/Userland/Libraries/LibWeb/CSS/CSSStyleRule.h index bfee3c0b6d..e8db816f6c 100644 --- a/Userland/Libraries/LibWeb/CSS/CSSStyleRule.h +++ b/Userland/Libraries/LibWeb/CSS/CSSStyleRule.h @@ -29,8 +29,8 @@ #include <AK/NonnullRefPtrVector.h> #include <LibWeb/CSS/CSSRule.h> +#include <LibWeb/CSS/CSSStyleDeclaration.h> #include <LibWeb/CSS/Selector.h> -#include <LibWeb/CSS/StyleDeclaration.h> namespace Web::CSS { @@ -39,7 +39,7 @@ class CSSStyleRule : public CSSRule { AK_MAKE_NONMOVABLE(CSSStyleRule); public: - static NonnullRefPtr<CSSStyleRule> create(Vector<Selector>&& selectors, NonnullRefPtr<StyleDeclaration>&& declaration) + static NonnullRefPtr<CSSStyleRule> create(Vector<Selector>&& selectors, NonnullRefPtr<CSSStyleDeclaration>&& declaration) { return adopt(*new CSSStyleRule(move(selectors), move(declaration))); } @@ -47,16 +47,16 @@ public: ~CSSStyleRule(); const Vector<Selector>& selectors() const { return m_selectors; } - const StyleDeclaration& declaration() const { return m_declaration; } + const CSSStyleDeclaration& declaration() const { return m_declaration; } virtual StringView class_name() const { return "CSSStyleRule"; }; virtual Type type() const { return Type::Style; }; private: - CSSStyleRule(Vector<Selector>&&, NonnullRefPtr<StyleDeclaration>&&); + CSSStyleRule(Vector<Selector>&&, NonnullRefPtr<CSSStyleDeclaration>&&); Vector<Selector> m_selectors; - NonnullRefPtr<StyleDeclaration> m_declaration; + NonnullRefPtr<CSSStyleDeclaration> m_declaration; }; } diff --git a/Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.cpp index f565186ef2..3c6b0e15f3 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.cpp @@ -808,7 +808,7 @@ public: return; } - rules.append(CSS::CSSStyleRule::create(move(current_rule.selectors), CSS::StyleDeclaration::create(move(current_rule.properties)))); + rules.append(CSS::CSSStyleRule::create(move(current_rule.selectors), CSS::CSSStyleDeclaration::create(move(current_rule.properties)))); } Optional<String> parse_string() @@ -947,7 +947,7 @@ public: return CSS::CSSStyleSheet::create(move(rules)); } - RefPtr<CSS::StyleDeclaration> parse_standalone_declaration() + RefPtr<CSS::CSSStyleDeclaration> parse_standalone_declaration() { consume_whitespace_or_comments(); for (;;) { @@ -958,7 +958,7 @@ public: if (!peek()) break; } - return CSS::StyleDeclaration::create(move(current_rule.properties)); + return CSS::CSSStyleDeclaration::create(move(current_rule.properties)); } private: @@ -993,10 +993,10 @@ RefPtr<CSS::CSSStyleSheet> parse_css(const CSS::ParsingContext& context, const S return parser.parse_sheet(); } -RefPtr<CSS::StyleDeclaration> parse_css_declaration(const CSS::ParsingContext& context, const StringView& css) +RefPtr<CSS::CSSStyleDeclaration> parse_css_declaration(const CSS::ParsingContext& context, const StringView& css) { if (css.is_empty()) - return CSS::StyleDeclaration::create({}); + return CSS::CSSStyleDeclaration::create({}); CSSParser parser(context, css); return parser.parse_standalone_declaration(); } diff --git a/Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.h b/Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.h index bf1da4229e..e03c83ba59 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.h +++ b/Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.h @@ -49,7 +49,7 @@ private: namespace Web { RefPtr<CSS::CSSStyleSheet> parse_css(const CSS::ParsingContext&, const StringView&); -RefPtr<CSS::StyleDeclaration> parse_css_declaration(const CSS::ParsingContext&, const StringView&); +RefPtr<CSS::CSSStyleDeclaration> parse_css_declaration(const CSS::ParsingContext&, const StringView&); RefPtr<CSS::StyleValue> parse_css_value(const CSS::ParsingContext&, const StringView&, CSS::PropertyID property_id = CSS::PropertyID::Invalid); Optional<CSS::Selector> parse_selector(const CSS::ParsingContext&, const StringView&); |