diff options
author | Bobby Holley <bobbyholley@gmail.com> | 2017-06-01 13:56:21 -0700 |
---|---|---|
committer | Bobby Holley <bobbyholley@gmail.com> | 2017-06-05 19:43:58 -0700 |
commit | 713c9a63f63c03f9aefd54664a6c5106cee514d7 (patch) | |
tree | 8bcc111e6905c14e847a110e780b689d2b3bdfb7 /components/script/dom | |
parent | e3d3c5a7b29e27a11bf2e4f024110b3afaf9cf6d (diff) | |
download | servo-713c9a63f63c03f9aefd54664a6c5106cee514d7.tar.gz servo-713c9a63f63c03f9aefd54664a6c5106cee514d7.zip |
Move the ancestor hashes out of Selector.
MozReview-Commit-ID: 5mipXnjgSED
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/element.rs | 4 | ||||
-rw-r--r-- | components/script/dom/node.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index be708113def..f875986edd2 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -2061,7 +2061,7 @@ impl ElementMethods for Element { Err(()) => Err(Error::Syntax), Ok(selectors) => { let mut ctx = MatchingContext::new(MatchingMode::Normal, None); - Ok(matches_selector_list(&selectors.0, &Root::from_ref(self), &mut ctx)) + Ok(matches_selector_list(&selectors, &Root::from_ref(self), &mut ctx)) } } } @@ -2080,7 +2080,7 @@ impl ElementMethods for Element { for element in root.inclusive_ancestors() { if let Some(element) = Root::downcast::<Element>(element) { let mut ctx = MatchingContext::new(MatchingMode::Normal, None); - if matches_selector_list(&selectors.0, &element, &mut ctx) { + if matches_selector_list(&selectors, &element, &mut ctx) { return Ok(Some(element)); } } diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index cc817587eda..8dde9cc7b01 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -345,7 +345,7 @@ impl<'a> Iterator for QuerySelectorIterator { type Item = Root<Node>; fn next(&mut self) -> Option<Root<Node>> { - let selectors = &self.selectors.0; + let selectors = &self.selectors; // TODO(cgaebel): Is it worth it to build a bloom filter here // (instead of passing `None`)? Probably. @@ -722,7 +722,7 @@ impl Node { 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, &mut ctx) + matches_selector_list(&selectors, element, &mut ctx) })) } } |