From 5913ba983ba6833abecfacd25a3c59052732989e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Ko=C5=82odziejski?= Date: Fri, 12 Dec 2014 10:07:41 -0800 Subject: [PATCH] Don't include the root element when calling Element#getElementsByTagNameNS. --- components/script/dom/htmlcollection.rs | 5 ++++- .../dom/nodes/Element-getElementsByTagNameNS.html.ini | 7 ------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs index 3ac4d491513..3de2f11e2e6 100644 --- a/components/script/dom/htmlcollection.rs +++ b/components/script/dom/htmlcollection.rs @@ -119,7 +119,10 @@ impl HTMLCollection { namespace_filter: Option } impl CollectionFilter for TagNameNSFilter { - fn filter(&self, elem: JSRef, _root: JSRef) -> bool { + fn filter(&self, elem: JSRef, root: JSRef) -> bool { + if NodeCast::from_ref(elem) == root { + return false + } let ns_match = match self.namespace_filter { Some(ref namespace) => { *elem.namespace() == *namespace diff --git a/tests/wpt/metadata/dom/nodes/Element-getElementsByTagNameNS.html.ini b/tests/wpt/metadata/dom/nodes/Element-getElementsByTagNameNS.html.ini index 4221c256afc..9cfcb9a43cc 100644 --- a/tests/wpt/metadata/dom/nodes/Element-getElementsByTagNameNS.html.ini +++ b/tests/wpt/metadata/dom/nodes/Element-getElementsByTagNameNS.html.ini @@ -5,10 +5,3 @@ [getElementsByTagNameNS(\'*\', \'*\')] expected: FAIL - - [Matching the context object (wildcard namespace)] - expected: FAIL - - [Matching the context object (specific namespace)] - expected: FAIL -