diff --git a/Libraries/LibWeb/CSS/StyleComputer.cpp b/Libraries/LibWeb/CSS/StyleComputer.cpp index 5dc5bbd51ab..4c1ee3fab43 100644 --- a/Libraries/LibWeb/CSS/StyleComputer.cpp +++ b/Libraries/LibWeb/CSS/StyleComputer.cpp @@ -407,7 +407,7 @@ void StyleComputer::for_each_stylesheet(CascadeOrigin cascade_origin, Callback c } } -RuleCache const* StyleComputer::rule_cache_for_cascade_origin(CascadeOrigin cascade_origin, FlyString const& qualified_layer_name, GC::Ptr shadow_root) const +RuleCache const* StyleComputer::rule_cache_for_cascade_origin(CascadeOrigin cascade_origin, Optional qualified_layer_name, GC::Ptr shadow_root) const { auto const* rule_caches_for_document_and_shadow_roots = [&]() -> RuleCachesForDocumentAndShadowRoots const* { switch (cascade_origin) { @@ -428,9 +428,9 @@ RuleCache const* StyleComputer::rule_cache_for_cascade_origin(CascadeOrigin casc }(); if (!rule_caches_by_layer) return nullptr; - if (qualified_layer_name.is_empty()) + if (!qualified_layer_name.has_value()) return &rule_caches_by_layer->main; - return rule_caches_by_layer->by_layer.get(qualified_layer_name).value_or(nullptr); + return rule_caches_by_layer->by_layer.get(*qualified_layer_name).value_or(nullptr); } [[nodiscard]] static bool filter_namespace_rule(Optional const& element_namespace_uri, MatchingRule const& rule) @@ -491,7 +491,7 @@ bool StyleComputer::invalidation_property_used_in_has_selector(InvalidationSet:: return false; } -Vector StyleComputer::collect_matching_rules(DOM::Element const& element, CascadeOrigin cascade_origin, Optional pseudo_element, PseudoClassBitmap& attempted_pseudo_class_matches, FlyString const& qualified_layer_name) const +Vector StyleComputer::collect_matching_rules(DOM::Element const& element, CascadeOrigin cascade_origin, Optional pseudo_element, PseudoClassBitmap& attempted_pseudo_class_matches, Optional qualified_layer_name) const { auto const& root_node = element.root(); auto shadow_root = is(root_node) ? static_cast(&root_node) : nullptr; diff --git a/Libraries/LibWeb/CSS/StyleComputer.h b/Libraries/LibWeb/CSS/StyleComputer.h index 0b9943c4d04..cd73dff68bf 100644 --- a/Libraries/LibWeb/CSS/StyleComputer.h +++ b/Libraries/LibWeb/CSS/StyleComputer.h @@ -150,7 +150,7 @@ public: [[nodiscard]] RuleCache const& get_pseudo_class_rule_cache(PseudoClass) const; - [[nodiscard]] Vector collect_matching_rules(DOM::Element const&, CascadeOrigin, Optional, PseudoClassBitmap& attempted_psuedo_class_matches, FlyString const& qualified_layer_name = {}) const; + [[nodiscard]] Vector collect_matching_rules(DOM::Element const&, CascadeOrigin, Optional, PseudoClassBitmap& attempted_psuedo_class_matches, Optional qualified_layer_name = {}) const; InvalidationSet invalidation_set_for_properties(Vector const&) const; bool invalidation_property_used_in_has_selector(InvalidationSet::Property const&) const; @@ -272,7 +272,7 @@ private: void make_rule_cache_for_cascade_origin(CascadeOrigin, SelectorInsights&); - [[nodiscard]] RuleCache const* rule_cache_for_cascade_origin(CascadeOrigin, FlyString const& qualified_layer_name, GC::Ptr) const; + [[nodiscard]] RuleCache const* rule_cache_for_cascade_origin(CascadeOrigin, Optional qualified_layer_name, GC::Ptr) const; static void collect_selector_insights(Selector const&, SelectorInsights&);