diff options
Diffstat (limited to 'components/script/dom/node.rs')
-rw-r--r-- | components/script/dom/node.rs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 8c8831801ef..1ad28974f3d 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -70,7 +70,7 @@ use script_layout_interface::{LayoutElementType, LayoutNodeType, TrustedNodeAddr use script_layout_interface::message::Msg; use script_traits::DocumentActivity; use script_traits::UntrustedNodeAddress; -use selectors::matching::matches_selector_list; +use selectors::matching::{matches_selector_list, MatchingContext, MatchingMode}; use selectors::parser::SelectorList; use servo_url::ServoUrl; use std::borrow::ToOwned; @@ -346,11 +346,14 @@ impl<'a> Iterator for QuerySelectorIterator { fn next(&mut self) -> Option<Root<Node>> { let selectors = &self.selectors.0; + // TODO(cgaebel): Is it worth it to build a bloom filter here // (instead of passing `None`)? Probably. + let mut ctx = MatchingContext::new(MatchingMode::Normal, None); + self.iterator.by_ref().filter_map(|node| { if let Some(element) = Root::downcast(node) { - if matches_selector_list(selectors, &element, None) { + if matches_selector_list(selectors, &element, &mut ctx) { return Some(Root::upcast(element)); } } @@ -717,8 +720,9 @@ impl Node { Err(()) => Err(Error::Syntax), // Step 3. Ok(selectors) => { + let mut ctx = MatchingContext::new(MatchingMode::Normal, None); Ok(self.traverse_preorder().filter_map(Root::downcast).find(|element| { - matches_selector_list(&selectors.0, element, None) + matches_selector_list(&selectors.0, element, &mut ctx) })) } } |