diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-02-08 19:33:27 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-08 19:33:27 -0800 |
commit | cbfd4464270f8690b90b9b96c395523a3a39e2de (patch) | |
tree | 56e6655417e818f4bf166172c942030363246481 /components/script/dom/node.rs | |
parent | 11c86b82f6598e63ebbc610e86352e75a948d878 (diff) | |
parent | 9e860df9df02492f0b67b86262abc3bbdc2d8b6f (diff) | |
download | servo-cbfd4464270f8690b90b9b96c395523a3a39e2de.tar.gz servo-cbfd4464270f8690b90b9b96c395523a3a39e2de.zip |
Auto merge of #15462 - bholley:accumulate_selector_flags, r=emilio
Accumulate parent elements that need selector bits set on the ThreadLocalStyleContext
Discussion and review in https://bugzilla.mozilla.org/show_bug.cgi?id=1336646
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15462)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/node.rs')
-rw-r--r-- | components/script/dom/node.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 37b5764c174..df335be75a6 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -67,7 +67,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::{MatchingReason, matches}; +use selectors::matching::matches; use selectors::parser::SelectorList; use servo_url::ServoUrl; use std::borrow::ToOwned; @@ -322,7 +322,7 @@ impl<'a> Iterator for QuerySelectorIterator { // (instead of passing `None`)? Probably. self.iterator.by_ref().filter_map(|node| { if let Some(element) = Root::downcast(node) { - if matches(selectors, &element, None, MatchingReason::Other) { + if matches(selectors, &element, None) { return Some(Root::upcast(element)); } } @@ -685,7 +685,7 @@ impl Node { // Step 3. Ok(selectors) => { Ok(self.traverse_preorder().filter_map(Root::downcast).find(|element| { - matches(&selectors.0, element, None, MatchingReason::Other) + matches(&selectors.0, element, None) })) } } |