RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 15:57:34 +00:00
Code Issues Activity Actions

LibWeb: Rename StyleRule => CSSStyleRule

Browse source 
This matches the CSSOM specification.
This commit is contained in:
Andreas Kling 2021-03-07 15:00:02 +01:00
parent 3532e1788f
commit 0af4762662
11 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWeb/CMakeLists.txt
View file

@ -11,6 +11,7 @@ set(SOURCES
Bindings/Wrappable.cpp Bindings/Wrappable.cpp
CSS/CSSImportRule.cpp CSS/CSSImportRule.cpp
CSS/CSSRule.cpp CSS/CSSRule.cpp
CSS/CSSStyleRule.cpp
CSS/DefaultStyleSheetSource.cpp CSS/DefaultStyleSheetSource.cpp
CSS/Length.cpp CSS/Length.cpp
CSS/Parser/CSSParser.cpp CSS/Parser/CSSParser.cpp
@ -23,7 +24,6 @@ set(SOURCES
CSS/StyleInvalidator.cpp CSS/StyleInvalidator.cpp
CSS/StyleProperties.cpp CSS/StyleProperties.cpp
CSS/StyleResolver.cpp CSS/StyleResolver.cpp
CSS/StyleRule.cpp
CSS/StyleSheet.cpp CSS/StyleSheet.cpp
CSS/StyleSheetList.cpp CSS/StyleSheetList.cpp
CSS/StyleValue.cpp CSS/StyleValue.cpp

6
Userland/Libraries/LibWeb/CSS/StyleRule.cpp → Userland/Libraries/LibWeb/CSS/CSSStyleRule.cpp
View file

@ -24,17 +24,17 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <LibWeb/CSS/StyleRule.h> #include <LibWeb/CSS/CSSStyleRule.h>
namespace Web::CSS { namespace Web::CSS {
StyleRule::StyleRule(Vector<Selector>&& selectors, NonnullRefPtr<StyleDeclaration>&& declaration) CSSStyleRule::CSSStyleRule(Vector<Selector>&& selectors, NonnullRefPtr<StyleDeclaration>&& declaration)
: m_selectors(move(selectors)) : m_selectors(move(selectors))
, m_declaration(move(declaration)) , m_declaration(move(declaration))
{ {
} }
StyleRule::~StyleRule() CSSStyleRule::~CSSStyleRule()
{ {
} }

16
Userland/Libraries/LibWeb/CSS/StyleRule.h → Userland/Libraries/LibWeb/CSS/CSSStyleRule.h
View file

@ -34,26 +34,26 @@
namespace Web::CSS { namespace Web::CSS {
class StyleRule : public CSSRule { class CSSStyleRule : public CSSRule {
AK_MAKE_NONCOPYABLE(StyleRule); AK_MAKE_NONCOPYABLE(CSSStyleRule);
AK_MAKE_NONMOVABLE(StyleRule); AK_MAKE_NONMOVABLE(CSSStyleRule);
public: public:
static NonnullRefPtr<StyleRule> create(Vector<Selector>&& selectors, NonnullRefPtr<StyleDeclaration>&& declaration) static NonnullRefPtr<CSSStyleRule> create(Vector<Selector>&& selectors, NonnullRefPtr<StyleDeclaration>&& declaration)
{ {
return adopt(*new StyleRule(move(selectors), move(declaration))); return adopt(*new CSSStyleRule(move(selectors), move(declaration)));
} }
~StyleRule(); ~CSSStyleRule();
const Vector<Selector>& selectors() const { return m_selectors; } const Vector<Selector>& selectors() const { return m_selectors; }
const StyleDeclaration& declaration() const { return m_declaration; } 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; }; virtual Type type() const { return Type::Style; };
private: private:
StyleRule(Vector<Selector>&&, NonnullRefPtr<StyleDeclaration>&&); CSSStyleRule(Vector<Selector>&&, NonnullRefPtr<StyleDeclaration>&&);
Vector<Selector> m_selectors; Vector<Selector> m_selectors;
NonnullRefPtr<StyleDeclaration> m_declaration; NonnullRefPtr<StyleDeclaration> m_declaration;

4
Userland/Libraries/LibWeb/CSS/Parser/CSSParser.cpp
View file

@ -27,9 +27,9 @@
#include <AK/HashMap.h> #include <AK/HashMap.h>
#include <LibWeb/CSS/CSSImportRule.h> #include <LibWeb/CSS/CSSImportRule.h>
#include <LibWeb/CSS/CSSRule.h> #include <LibWeb/CSS/CSSRule.h>
#include <LibWeb/CSS/CSSStyleRule.h>
#include <LibWeb/CSS/Parser/CSSParser.h> #include <LibWeb/CSS/Parser/CSSParser.h>
#include <LibWeb/CSS/PropertyID.h> #include <LibWeb/CSS/PropertyID.h>
#include <LibWeb/CSS/StyleRule.h>
#include <LibWeb/CSS/StyleSheet.h> #include <LibWeb/CSS/StyleSheet.h>
#include <LibWeb/DOM/Document.h> #include <LibWeb/DOM/Document.h>
#include <ctype.h> #include <ctype.h>
@ -809,7 +809,7 @@ public:
return; 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<String> parse_string() Optional<String> parse_string()

2
Userland/Libraries/LibWeb/CSS/StyleInvalidator.cpp
View file

@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <LibWeb/CSS/CSSStyleRule.h>
#include <LibWeb/CSS/StyleInvalidator.h> #include <LibWeb/CSS/StyleInvalidator.h>
#include <LibWeb/CSS/StyleRule.h>
#include <LibWeb/DOM/Document.h> #include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/Element.h> #include <LibWeb/DOM/Element.h>

2
Userland/Libraries/LibWeb/CSS/StyleResolver.cpp
View file

@ -26,10 +26,10 @@
*/ */
#include <AK/QuickSort.h> #include <AK/QuickSort.h>
#include <LibWeb/CSS/CSSStyleRule.h>
#include <LibWeb/CSS/Parser/CSSParser.h> #include <LibWeb/CSS/Parser/CSSParser.h>
#include <LibWeb/CSS/SelectorEngine.h> #include <LibWeb/CSS/SelectorEngine.h>
#include <LibWeb/CSS/StyleResolver.h> #include <LibWeb/CSS/StyleResolver.h>
#include <LibWeb/CSS/StyleRule.h>
#include <LibWeb/CSS/StyleSheet.h> #include <LibWeb/CSS/StyleSheet.h>
#include <LibWeb/DOM/Document.h> #include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/Element.h> #include <LibWeb/DOM/Element.h>

2
Userland/Libraries/LibWeb/CSS/StyleResolver.h
View file

@ -34,7 +34,7 @@
namespace Web::CSS { namespace Web::CSS {
struct MatchingRule { struct MatchingRule {
RefPtr<StyleRule> rule; RefPtr<CSSStyleRule> rule;
size_t style_sheet_index { 0 }; size_t style_sheet_index { 0 };
size_t rule_index { 0 }; size_t rule_index { 0 };
size_t selector_index { 0 }; size_t selector_index { 0 };

2
Userland/Libraries/LibWeb/CSS/StyleSheet.h
View file

@ -52,7 +52,7 @@ public:
{ {
for (auto& rule : m_rules) for (auto& rule : m_rules)
if (rule.type() == CSSRule::Type::Style) { if (rule.type() == CSSRule::Type::Style) {
callback(downcast<StyleRule>(rule)); callback(downcast<CSSStyleRule>(rule));
} else if (rule.type() == CSSRule::Type::Import) { } else if (rule.type() == CSSRule::Type::Import) {
const CSSImportRule& import_rule = downcast<CSSImportRule>(rule); const CSSImportRule& import_rule = downcast<CSSImportRule>(rule);
if (import_rule.has_import_result()) if (import_rule.has_import_result())

6
Userland/Libraries/LibWeb/Dump.cpp
View file

@ -30,8 +30,8 @@
#include <AK/Utf8View.h> #include <AK/Utf8View.h>
#include <LibWeb/CSS/CSSImportRule.h> #include <LibWeb/CSS/CSSImportRule.h>
#include <LibWeb/CSS/CSSRule.h> #include <LibWeb/CSS/CSSRule.h>
#include <LibWeb/CSS/CSSStyleRule.h>
#include <LibWeb/CSS/PropertyID.h> #include <LibWeb/CSS/PropertyID.h>
#include <LibWeb/CSS/StyleRule.h>
#include <LibWeb/CSS/StyleSheet.h> #include <LibWeb/CSS/StyleSheet.h>
#include <LibWeb/DOM/Comment.h> #include <LibWeb/DOM/Comment.h>
#include <LibWeb/DOM/Document.h> #include <LibWeb/DOM/Document.h>
@ -405,7 +405,7 @@ void dump_rule(StringBuilder& builder, const CSS::CSSRule& rule)
builder.appendff("{}:\n", rule.class_name()); builder.appendff("{}:\n", rule.class_name());
switch (rule.type()) { switch (rule.type()) {
case CSS::CSSRule::Type::Style: case CSS::CSSRule::Type::Style:
dump_style_rule(builder, downcast<const CSS::StyleRule>(rule)); dump_style_rule(builder, downcast<const CSS::CSSStyleRule>(rule));
break; break;
case CSS::CSSRule::Type::Import: case CSS::CSSRule::Type::Import:
dump_import_rule(builder, downcast<const CSS::CSSImportRule>(rule)); dump_import_rule(builder, downcast<const CSS::CSSImportRule>(rule));
@ -420,7 +420,7 @@ void dump_import_rule(StringBuilder& builder, const CSS::CSSImportRule& rule)
builder.appendff(" Document URL: {}\n", rule.url()); 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()) { for (auto& selector : rule.selectors()) {
dump_selector(builder, selector); dump_selector(builder, selector);

2
Userland/Libraries/LibWeb/Dump.h
View file

@ -40,7 +40,7 @@ void dump_sheet(StringBuilder&, const CSS::StyleSheet&);
void dump_sheet(const CSS::StyleSheet&); void dump_sheet(const CSS::StyleSheet&);
void dump_rule(StringBuilder&, const CSS::CSSRule&); void dump_rule(StringBuilder&, const CSS::CSSRule&);
void dump_rule(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_import_rule(StringBuilder&, const CSS::CSSImportRule&);
void dump_selector(StringBuilder&, const CSS::Selector&); void dump_selector(StringBuilder&, const CSS::Selector&);
void dump_selector(const CSS::Selector&); void dump_selector(const CSS::Selector&);

2
Userland/Libraries/LibWeb/Forward.h
View file

@ -30,12 +30,12 @@
namespace Web::CSS { namespace Web::CSS {
class CSSRule; class CSSRule;
class CSSImportRule; class CSSImportRule;
class CSSStyleRule;
class Length; class Length;
class Selector; class Selector;
class StyleDeclaration; class StyleDeclaration;
class StyleProperties; class StyleProperties;
class StyleResolver; class StyleResolver;
class StyleRule;
class StyleSheet; class StyleSheet;
enum class Display; enum class Display;
} }