mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-04 15:19:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibWeb/CSS: Use SelectorList type instead of Vector<NNRP<Selector>>

Browse source
This commit is contained in:
Sam Atkins 2024-10-17 12:01:13 +01:00 • committed by Andreas Kling
commit 74c448d744
Notes: github-actions[bot] 2024-10-17 18:57:20 +00:00
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibWeb/CSS/CSSStyleRule.cpp
View file

@ -16,12 +16,12 @@ namespace Web::CSS {
JS_DEFINE_ALLOCATOR(CSSStyleRule); JS_DEFINE_ALLOCATOR(CSSStyleRule);
JS::NonnullGCPtr<CSSStyleRule> CSSStyleRule::create(JS::Realm& realm, Vector<NonnullRefPtr<Web::CSS::Selector>>&& selectors, PropertyOwningCSSStyleDeclaration& declaration, CSSRuleList& nested_rules) JS::NonnullGCPtr<CSSStyleRule> CSSStyleRule::create(JS::Realm& realm, SelectorList&& selectors, PropertyOwningCSSStyleDeclaration& declaration, CSSRuleList& nested_rules)
{ {
return realm.heap().allocate<CSSStyleRule>(realm, realm, move(selectors), declaration, nested_rules); return realm.heap().allocate<CSSStyleRule>(realm, realm, move(selectors), declaration, nested_rules);
} }
CSSStyleRule::CSSStyleRule(JS::Realm& realm, Vector<NonnullRefPtr<Selector>>&& selectors, PropertyOwningCSSStyleDeclaration& declaration, CSSRuleList& nested_rules) CSSStyleRule::CSSStyleRule(JS::Realm& realm, SelectorList&& selectors, PropertyOwningCSSStyleDeclaration& declaration, CSSRuleList& nested_rules)
: CSSGroupingRule(realm, nested_rules) : CSSGroupingRule(realm, nested_rules)
, m_selectors(move(selectors)) , m_selectors(move(selectors))
, m_declaration(declaration) , m_declaration(declaration)

8
Userland/Libraries/LibWeb/CSS/CSSStyleRule.h
View file

@ -19,11 +19,11 @@ class CSSStyleRule final : public CSSGroupingRule {
JS_DECLARE_ALLOCATOR(CSSStyleRule); JS_DECLARE_ALLOCATOR(CSSStyleRule);
public: public:
[[nodiscard]] static JS::NonnullGCPtr<CSSStyleRule> create(JS::Realm&, Vector<NonnullRefPtr<Selector>>&&, PropertyOwningCSSStyleDeclaration&, CSSRuleList&); [[nodiscard]] static JS::NonnullGCPtr<CSSStyleRule> create(JS::Realm&, SelectorList&&, PropertyOwningCSSStyleDeclaration&, CSSRuleList&);
virtual ~CSSStyleRule() override = default; virtual ~CSSStyleRule() override = default;
Vector<NonnullRefPtr<Selector>> const& selectors() const { return m_selectors; } SelectorList const& selectors() const { return m_selectors; }
PropertyOwningCSSStyleDeclaration const& declaration() const { return m_declaration; } PropertyOwningCSSStyleDeclaration const& declaration() const { return m_declaration; }
virtual Type type() const override { return Type::Style; } virtual Type type() const override { return Type::Style; }
@ -36,13 +36,13 @@ public:
[[nodiscard]] FlyString const& qualified_layer_name() const { return parent_layer_internal_qualified_name(); } [[nodiscard]] FlyString const& qualified_layer_name() const { return parent_layer_internal_qualified_name(); }
private: private:
CSSStyleRule(JS::Realm&, Vector<NonnullRefPtr<Selector>>&&, PropertyOwningCSSStyleDeclaration&, CSSRuleList&); CSSStyleRule(JS::Realm&, SelectorList&&, PropertyOwningCSSStyleDeclaration&, CSSRuleList&);
virtual void initialize(JS::Realm&) override; virtual void initialize(JS::Realm&) override;
virtual void visit_edges(Cell::Visitor&) override; virtual void visit_edges(Cell::Visitor&) override;
virtual String serialized() const override; virtual String serialized() const override;
Vector<NonnullRefPtr<Selector>> m_selectors; SelectorList m_selectors;
JS::NonnullGCPtr<PropertyOwningCSSStyleDeclaration> m_declaration; JS::NonnullGCPtr<PropertyOwningCSSStyleDeclaration> m_declaration;
}; };

2
Userland/Libraries/LibWeb/CSS/Parser/SelectorParsing.cpp
View file

@ -65,7 +65,7 @@ Parser::ParseErrorOr<SelectorList> Parser::parse_a_selector_list(TokenStream<T>&
{ {
auto comma_separated_lists = parse_a_comma_separated_list_of_component_values(tokens); auto comma_separated_lists = parse_a_comma_separated_list_of_component_values(tokens);
Vector<NonnullRefPtr<Selector>> selectors; SelectorList selectors;
for (auto& selector_parts : comma_separated_lists) { for (auto& selector_parts : comma_separated_lists) {
auto stream = TokenStream(selector_parts); auto stream = TokenStream(selector_parts);
auto selector = parse_complex_selector(stream, mode); auto selector = parse_complex_selector(stream, mode);

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

@ -407,7 +407,7 @@ String Selector::serialize() const
} }
// https://www.w3.org/TR/cssom/#serialize-a-group-of-selectors // https://www.w3.org/TR/cssom/#serialize-a-group-of-selectors
String serialize_a_group_of_selectors(Vector<NonnullRefPtr<Selector>> const& selectors) String serialize_a_group_of_selectors(SelectorList const& selectors)
{ {
// To serialize a group of selectors serialize each selector in the group of selectors and then serialize a comma-separated list of these serializations. // To serialize a group of selectors serialize each selector in the group of selectors and then serialize a comma-separated list of these serializations.
return MUST(String::join(", "sv, selectors)); return MUST(String::join(", "sv, selectors));

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

@ -257,7 +257,7 @@ private:
Array<u32, 8> m_ancestor_hashes; Array<u32, 8> m_ancestor_hashes;
}; };
String serialize_a_group_of_selectors(Vector<NonnullRefPtr<Selector>> const& selectors); String serialize_a_group_of_selectors(SelectorList const& selectors);
} }