diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-04 05:53:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-04 05:53:14 -0700 |
| commit | 3c51290f9e3bb5a1b4118671f24fba219abeabc8 (patch) | |
| tree | f7f833992fa27ba86310c98cbd47cbc7db333fab /components/script/dom | |
| parent | 110fd6861007544b4f5b15d49da4f297c200bd7c (diff) | |
| parent | 345eee92e8877c66764f4775ca477cc6ad73c366 (diff) | |
| download | servo-3c51290f9e3bb5a1b4118671f24fba219abeabc8.tar.gz servo-3c51290f9e3bb5a1b4118671f24fba219abeabc8.zip | |
Auto merge of #12214 - nox:queryselector, r=Ms2ger
Skip the root node in querySelectorAll
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12214)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/node.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index ec370dff293..871eb4b13ca 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -740,7 +740,10 @@ impl Node { Err(()) => Err(Error::Syntax), // Step 3. Ok(selectors) => { - Ok(QuerySelectorIterator::new(self.traverse_preorder(), selectors)) + let mut descendants = self.traverse_preorder(); + // Skip the root of the tree. + assert!(&*descendants.next().unwrap() == self); + Ok(QuerySelectorIterator::new(descendants, selectors)) } } } |