From 6b3af4d3aa1dd1a1adec4d9bacfea1e6400eed67 Mon Sep 17 00:00:00 2001 From: Nico Burns Date: Fri, 6 Sep 2024 12:32:44 +0100 Subject: [PATCH] Simplify function signature of attr_matches function --- packages/dom/src/stylo.rs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/dom/src/stylo.rs b/packages/dom/src/stylo.rs index bdb61155..7ea9e0eb 100644 --- a/packages/dom/src/stylo.rs +++ b/packages/dom/src/stylo.rs @@ -7,9 +7,11 @@ use crate::node::Node; use crate::node::NodeData; use atomic_refcell::{AtomicRef, AtomicRefMut}; +use html5ever::LocalNameStaticSet; +use html5ever::NamespaceStaticSet; use html5ever::{local_name, LocalName, Namespace}; use selectors::{ - attr::{AttrSelectorOperation, AttrSelectorOperator}, + attr::{AttrSelectorOperation, AttrSelectorOperator, NamespaceConstraint}, matching::{ElementSelectorFlags, MatchingContext, VisitedHandlingMode}, sink::Push, Element, OpaqueElement, @@ -22,6 +24,7 @@ use style::selector_parser::PseudoElement; use style::stylesheets::layer_rule::LayerOrder; use style::values::computed::Percentage; use style::values::specified::box_::DisplayOutside; +use style::values::AtomString; use style::CaseSensitivityExt; use style::{ animation::DocumentAnimationSet, @@ -351,14 +354,10 @@ impl<'a> selectors::Element for BlitzNode<'a> { fn attr_matches( &self, - _ns: &selectors::attr::NamespaceConstraint< - &::NamespaceUrl, - >, - local_name: &::LocalName, - operation: &AttrSelectorOperation<&::AttrValue>, + _ns: &NamespaceConstraint<&GenericAtomIdent>, + local_name: &GenericAtomIdent, + operation: &AttrSelectorOperation<&AtomString>, ) -> bool { - // println!("attr matches {}", self.id); - let Some(attr_value) = self.raw_dom_data.attr(local_name.0.clone()) else { return false; };