Skip the root node in querySelectorAll

This accounts for whatwg/dom#263.
nox · Jul 4, 2016 · 20df418 · 20df418
1 parent 110fd68
commit 20df418
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git 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))
             }
         }
     }

diff --git a/tests/wpt/metadata/dom/nodes/ParentNode-querySelector-All-xht.xht.ini b/tests/wpt/metadata/dom/nodes/ParentNode-querySelector-All-xht.xht.ini
@@ -1,11 +1,5 @@
 [ParentNode-querySelector-All-xht.xht]
   type: testharness
-  [Detached Element.querySelectorAll tree order]
-    expected: FAIL
-
-  [In-document Element.querySelectorAll tree order]
-    expected: FAIL
-
   [Document.querySelectorAll: Attribute whitespace-separated list selector, not matching class attribute with empty value: #attr-whitespace [class~=""\]]
     expected: FAIL
 

diff --git a/tests/wpt/metadata/dom/nodes/ParentNode-querySelector-All.html.ini b/tests/wpt/metadata/dom/nodes/ParentNode-querySelector-All.html.ini
@@ -1,11 +1,5 @@
 [ParentNode-querySelector-All.html]
   type: testharness
-  [Detached Element.querySelectorAll tree order]
-    expected: FAIL
-
-  [In-document Element.querySelectorAll tree order]
-    expected: FAIL
-
   [Document.querySelectorAll: Attribute whitespace-separated list selector, not matching class attribute with empty value: #attr-whitespace [class~=""\]]
     expected: FAIL
 

diff --git a/tests/wpt/mozilla/tests/mozilla/parentNode_querySelectorAll.html b/tests/wpt/mozilla/tests/mozilla/parentNode_querySelectorAll.html
@@ -33,7 +33,7 @@
                 assert_equals(nodelist.length, 3);
 
                 nodelist = div.querySelectorAll("div:nth-of-type(1)");
-                assert_equals(nodelist.item(0), div);
+                assert_equals(nodelist.item(0), div.firstChild);
             }, "Element");
 
             test(function() {