diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index dd0ed73a0b..eb495c7657 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -50,7 +50,7 @@ set(SOURCES CSS/Parser/DeclarationOrAtRule.cpp CSS/Parser/Function.cpp CSS/Parser/Parser.cpp - CSS/Parser/StyleRule.cpp + CSS/Parser/Rule.cpp CSS/Parser/Token.cpp CSS/Parser/Tokenizer.cpp CSS/Percentage.cpp diff --git a/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.cpp b/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.cpp index 24ba37d5ac..6c3566bec0 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.cpp @@ -9,7 +9,7 @@ namespace Web::CSS::Parser { -DeclarationOrAtRule::DeclarationOrAtRule(RefPtr at) +DeclarationOrAtRule::DeclarationOrAtRule(RefPtr at) : m_type(DeclarationType::At) , m_at(move(at)) { diff --git a/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.h b/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.h index e8b8f67a84..e5a35f8bb1 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.h +++ b/Userland/Libraries/LibWeb/CSS/Parser/DeclarationOrAtRule.h @@ -7,13 +7,13 @@ #pragma once #include -#include +#include namespace Web::CSS::Parser { class DeclarationOrAtRule { public: - explicit DeclarationOrAtRule(RefPtr at); + explicit DeclarationOrAtRule(RefPtr at); explicit DeclarationOrAtRule(Declaration declaration); ~DeclarationOrAtRule(); @@ -25,7 +25,7 @@ public: bool is_at_rule() const { return m_type == DeclarationType::At; } bool is_declaration() const { return m_type == DeclarationType::Declaration; } - StyleRule const& at_rule() const + Rule const& at_rule() const { VERIFY(is_at_rule()); return *m_at; @@ -41,7 +41,7 @@ public: private: DeclarationType m_type; - RefPtr m_at; + RefPtr m_at; Optional m_declaration; }; diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index ed19694494..d714e559b4 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -1520,12 +1520,12 @@ Optional Parser::parse_general_enclosed(TokenStream -NonnullRefPtrVector Parser::consume_a_list_of_rules(TokenStream& tokens, TopLevel top_level) +NonnullRefPtrVector Parser::consume_a_list_of_rules(TokenStream& tokens, TopLevel top_level) { // To consume a list of rules, given a top-level flag: // Create an initially empty list of rules. - NonnullRefPtrVector rules; + NonnullRefPtrVector rules; // Repeatedly consume the next input token: for (;;) { @@ -1588,7 +1588,7 @@ NonnullRefPtrVector Parser::consume_a_list_of_rules(TokenStream& t // 5.4.2. Consume an at-rule // https://www.w3.org/TR/css-syntax-3/#consume-at-rule template -NonnullRefPtr Parser::consume_an_at_rule(TokenStream& tokens) +NonnullRefPtr Parser::consume_an_at_rule(TokenStream& tokens) { // To consume an at-rule: @@ -1597,7 +1597,7 @@ NonnullRefPtr Parser::consume_an_at_rule(TokenStream& tokens) VERIFY(name_ident.is(Token::Type::AtKeyword)); // Create a new at-rule with its name set to the value of the current input token, its prelude initially set to an empty list, and its value initially set to nothing. - // NOTE: We create the StyleRule fully initialized when we return it instead. + // NOTE: We create the Rule fully initialized when we return it instead. FlyString at_rule_name = ((Token)name_ident).at_keyword(); Vector prelude; RefPtr block; @@ -1609,21 +1609,21 @@ NonnullRefPtr Parser::consume_an_at_rule(TokenStream& tokens) // if (token.is(Token::Type::Semicolon)) { // Return the at-rule. - return StyleRule::make_at_rule(move(at_rule_name), move(prelude), move(block)); + return Rule::make_at_rule(move(at_rule_name), move(prelude), move(block)); } // if (token.is(Token::Type::EndOfFile)) { // This is a parse error. Return the at-rule. log_parse_error(); - return StyleRule::make_at_rule(move(at_rule_name), move(prelude), move(block)); + return Rule::make_at_rule(move(at_rule_name), move(prelude), move(block)); } // <{-token> if (token.is(Token::Type::OpenCurly)) { // Consume a simple block and assign it to the at-rule’s block. Return the at-rule. block = consume_a_simple_block(tokens); - return StyleRule::make_at_rule(move(at_rule_name), move(prelude), move(block)); + return Rule::make_at_rule(move(at_rule_name), move(prelude), move(block)); } // simple block with an associated token of <{-token> @@ -1632,7 +1632,7 @@ NonnullRefPtr Parser::consume_an_at_rule(TokenStream& tokens) if (component_value.is_block() && component_value.block().is_curly()) { // Assign the block to the at-rule’s block. Return the at-rule. block = component_value.block(); - return StyleRule::make_at_rule(move(at_rule_name), move(prelude), move(block)); + return Rule::make_at_rule(move(at_rule_name), move(prelude), move(block)); } } @@ -1649,12 +1649,12 @@ NonnullRefPtr Parser::consume_an_at_rule(TokenStream& tokens) // 5.4.3. Consume a qualified rule // https://www.w3.org/TR/css-syntax-3/#consume-qualified-rule template -RefPtr Parser::consume_a_qualified_rule(TokenStream& tokens) +RefPtr Parser::consume_a_qualified_rule(TokenStream& tokens) { // To consume a qualified rule: // Create a new qualified rule with its prelude initially set to an empty list, and its value initially set to nothing. - // NOTE: We create the StyleRule fully initialized when we return it instead. + // NOTE: We create the Rule fully initialized when we return it instead. Vector prelude; RefPtr block; @@ -1673,7 +1673,7 @@ RefPtr Parser::consume_a_qualified_rule(TokenStream& tokens) if (token.is(Token::Type::OpenCurly)) { // Consume a simple block and assign it to the qualified rule’s block. Return the qualified rule. block = consume_a_simple_block(tokens); - return StyleRule::make_qualified_rule(move(prelude), move(block)); + return Rule::make_qualified_rule(move(prelude), move(block)); } // simple block with an associated token of <{-token> @@ -1682,7 +1682,7 @@ RefPtr Parser::consume_a_qualified_rule(TokenStream& tokens) if (component_value.is_block() && component_value.block().is_curly()) { // Assign the block to the qualified rule’s block. Return the qualified rule. block = component_value.block(); - return StyleRule::make_qualified_rule(move(prelude), move(block)); + return Rule::make_qualified_rule(move(prelude), move(block)); } } @@ -2112,10 +2112,10 @@ RefPtr Parser::parse_as_css_rule() // 5.3.5. Parse a rule // https://www.w3.org/TR/css-syntax-3/#parse-rule template -RefPtr Parser::parse_a_rule(TokenStream& tokens) +RefPtr Parser::parse_a_rule(TokenStream& tokens) { // To parse a rule from input: - RefPtr rule; + RefPtr rule; // 1. Normalize input, and set input to the result. // Note: This is done when initializing the Parser. @@ -2153,7 +2153,7 @@ RefPtr Parser::parse_a_rule(TokenStream& tokens) // 5.3.4. Parse a list of rules // https://www.w3.org/TR/css-syntax-3/#parse-list-of-rules template -NonnullRefPtrVector Parser::parse_a_list_of_rules(TokenStream& tokens) +NonnullRefPtrVector Parser::parse_a_list_of_rules(TokenStream& tokens) { // To parse a list of rules from input: @@ -2373,7 +2373,7 @@ Optional Parser::parse_url_function(ComponentValue const& component_val return {}; } -RefPtr Parser::convert_to_rule(NonnullRefPtr rule) +RefPtr Parser::convert_to_rule(NonnullRefPtr rule) { if (rule->is_at_rule()) { if (has_ignored_vendor_prefix(rule->at_rule_name())) { diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h index 617105fd1d..f825f39a0c 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -121,18 +121,18 @@ private: // "Parse a stylesheet" is intended to be the normal parser entry point, for parsing stylesheets. struct ParsedStyleSheet { Optional location; - NonnullRefPtrVector rules; + NonnullRefPtrVector rules; }; template ParsedStyleSheet parse_a_stylesheet(TokenStream&, Optional location); // "Parse a list of rules" is intended for the content of at-rules such as @media. It differs from "Parse a stylesheet" in the handling of and . template - NonnullRefPtrVector parse_a_list_of_rules(TokenStream&); + NonnullRefPtrVector parse_a_list_of_rules(TokenStream&); // "Parse a rule" is intended for use by the CSSStyleSheet#insertRule method, and similar functions which might exist, which parse text into a single rule. template - RefPtr parse_a_rule(TokenStream&); + RefPtr parse_a_rule(TokenStream&); // "Parse a declaration" is used in @supports conditions. [CSS3-CONDITIONAL] template @@ -179,11 +179,11 @@ private: Yes }; template - [[nodiscard]] NonnullRefPtrVector consume_a_list_of_rules(TokenStream&, TopLevel); + [[nodiscard]] NonnullRefPtrVector consume_a_list_of_rules(TokenStream&, TopLevel); template - [[nodiscard]] NonnullRefPtr consume_an_at_rule(TokenStream&); + [[nodiscard]] NonnullRefPtr consume_an_at_rule(TokenStream&); template - RefPtr consume_a_qualified_rule(TokenStream&); + RefPtr consume_a_qualified_rule(TokenStream&); template [[nodiscard]] Vector consume_a_style_blocks_contents(TokenStream&); template @@ -202,7 +202,7 @@ private: RefPtr parse_font_face_rule(TokenStream&); Vector parse_font_face_src(TokenStream&); - RefPtr convert_to_rule(NonnullRefPtr); + RefPtr convert_to_rule(NonnullRefPtr); RefPtr convert_to_style_declaration(Vector declarations); Optional convert_to_style_property(Declaration const&); diff --git a/Userland/Libraries/LibWeb/CSS/Parser/StyleRule.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Rule.cpp similarity index 75% rename from Userland/Libraries/LibWeb/CSS/Parser/StyleRule.cpp rename to Userland/Libraries/LibWeb/CSS/Parser/Rule.cpp index 56c2bd6e58..bffe151eae 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/StyleRule.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Rule.cpp @@ -5,12 +5,12 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include namespace Web::CSS::Parser { -StyleRule::StyleRule(StyleRule::Type type, FlyString name, Vector prelude, RefPtr block) +Rule::Rule(Rule::Type type, FlyString name, Vector prelude, RefPtr block) : m_type(type) , m_at_rule_name(move(name)) , m_prelude(move(prelude)) @@ -18,9 +18,9 @@ StyleRule::StyleRule(StyleRule::Type type, FlyString name, Vector { +class Rule : public RefCounted { public: enum class Type { At, Qualified, }; - static NonnullRefPtr make_at_rule(FlyString name, Vector prelude, RefPtr block) + static NonnullRefPtr make_at_rule(FlyString name, Vector prelude, RefPtr block) { - return adopt_ref(*new StyleRule(Type::At, move(name), move(prelude), move(block))); + return adopt_ref(*new Rule(Type::At, move(name), move(prelude), move(block))); } - static NonnullRefPtr make_qualified_rule(Vector prelude, RefPtr block) + static NonnullRefPtr make_qualified_rule(Vector prelude, RefPtr block) { - return adopt_ref(*new StyleRule(Type::Qualified, {}, move(prelude), move(block))); + return adopt_ref(*new Rule(Type::Qualified, {}, move(prelude), move(block))); } - ~StyleRule(); + ~Rule(); bool is_qualified_rule() const { return m_type == Type::Qualified; } bool is_at_rule() const { return m_type == Type::At; } @@ -44,7 +44,7 @@ public: String to_string() const; private: - StyleRule(Type, FlyString name, Vector prelude, RefPtr); + Rule(Type, FlyString name, Vector prelude, RefPtr); Type const m_type; FlyString m_at_rule_name; diff --git a/Userland/Libraries/LibWeb/Forward.h b/Userland/Libraries/LibWeb/Forward.h index a05e23e26a..84b3c1c805 100644 --- a/Userland/Libraries/LibWeb/Forward.h +++ b/Userland/Libraries/LibWeb/Forward.h @@ -105,7 +105,7 @@ class Declaration; class DeclarationOrAtRule; class Function; class Parser; -class StyleRule; +class Rule; class Token; class Tokenizer; }