auto merge of #4354 : neojski/servo/getElementsByTagNameNS-filter-root, r=Ms2ger

This fixes #4349.
This commit is contained in:
bors-servo 2014-12-12 14:09:53 -07:00
commit 9e83f096a5
3 changed files with 8 additions and 20 deletions

View file

@ -62,7 +62,10 @@ impl HTMLCollection {
namespace_filter: Option<Namespace>
}
impl CollectionFilter for AllElementFilter {
fn filter(&self, elem: JSRef<Element>, _root: JSRef<Node>) -> bool {
fn filter(&self, elem: JSRef<Element>, root: JSRef<Node>) -> bool {
if NodeCast::from_ref(elem) == root {
return false
}
match self.namespace_filter {
None => true,
Some(ref namespace) => *elem.namespace() == *namespace
@ -119,7 +122,10 @@ impl HTMLCollection {
namespace_filter: Option<Namespace>
}
impl CollectionFilter for TagNameNSFilter {
fn filter(&self, elem: JSRef<Element>, _root: JSRef<Node>) -> bool {
fn filter(&self, elem: JSRef<Element>, root: JSRef<Node>) -> bool {
if NodeCast::from_ref(elem) == root {
return false
}
let ns_match = match self.namespace_filter {
Some(ref namespace) => {
*elem.namespace() == *namespace