Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Factor out part of the traversal routine in HTMLCollection.

Browse source 
I would move the filter() call into the traverse function as well, but the
callback can't outlive its stack frame.
This commit is contained in:
Ms2ger 2014-12-13 10:34:38 +01:00
parent ea39b878ac
commit 4a2c4b65cc
1 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

43
components/script/dom/htmlcollection.rs
View file

@ -10,12 +10,13 @@ use dom::bindings::js::{JS, JSRef, Temporary};
use dom::bindings::trace::JSTraceable; use dom::bindings::trace::JSTraceable;
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
use dom::element::{Element, AttributeHandlers, ElementHelpers}; use dom::element::{Element, AttributeHandlers, ElementHelpers};
use dom::node::{Node, NodeHelpers}; use dom::node::{Node, NodeHelpers, TreeIterator};
use dom::window::Window; use dom::window::Window;
use servo_util::namespace; use servo_util::namespace;
use servo_util::str::{DOMString, split_html_space_chars}; use servo_util::str::{DOMString, split_html_space_chars};
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
use std::iter::FilterMap;
use string_cache::{Atom, Namespace}; use string_cache::{Atom, Namespace};
pub trait CollectionFilter : JSTraceable { pub trait CollectionFilter : JSTraceable {
@ -171,6 +172,14 @@ impl HTMLCollection {
} }
HTMLCollection::create(window, root, box ElementChildFilter) HTMLCollection::create(window, root, box ElementChildFilter)
} }
fn traverse<'a>(root: JSRef<'a, Node>)
-> FilterMap<'a, JSRef<'a, Node>,
JSRef<'a, Element>,
TreeIterator<'a>> {
root.traverse_preorder()
.filter_map(ElementCast::to_ref)
}
} }
impl<'a> HTMLCollectionMethods for JSRef<'a, HTMLCollection> { impl<'a> HTMLCollectionMethods for JSRef<'a, HTMLCollection> {
@ -180,11 +189,9 @@ impl<'a> HTMLCollectionMethods for JSRef<'a, HTMLCollection> {
Static(ref elems) => elems.len() as u32, Static(ref elems) => elems.len() as u32,
Live(ref root, ref filter) => { Live(ref root, ref filter) => {
let root = root.root(); let root = root.root();
root.traverse_preorder() HTMLCollection::traverse(*root)
.filter(|&child| { .filter(|element| filter.filter(*element, *root))
let elem: Option<JSRef<Element>> = ElementCast::to_ref(child); .count() as u32
elem.map_or(false, |elem| filter.filter(elem, *root))
}).count() as u32
} }
} }
} }
@ -198,17 +205,11 @@ impl<'a> HTMLCollectionMethods for JSRef<'a, HTMLCollection> {
.map(|elem| Temporary::new(elem.clone())), .map(|elem| Temporary::new(elem.clone())),
Live(ref root, ref filter) => { Live(ref root, ref filter) => {
let root = root.root(); let root = root.root();
root.traverse_preorder() HTMLCollection::traverse(*root)
.filter_map(|node| { .filter(|element| filter.filter(*element, *root))
let elem: Option<JSRef<Element>> = ElementCast::to_ref(node);
match elem {
Some(ref elem) if filter.filter(*elem, *root) => Some(elem.clone()),
_ => None
}
})
.nth(index as uint) .nth(index as uint)
.clone() .clone()
.map(|elem| Temporary::from_rooted(elem)) .map(Temporary::from_rooted)
} }
} }
} }
@ -230,18 +231,12 @@ impl<'a> HTMLCollectionMethods for JSRef<'a, HTMLCollection> {
.map(|maybe_elem| Temporary::from_rooted(*maybe_elem)), .map(|maybe_elem| Temporary::from_rooted(*maybe_elem)),
Live(ref root, ref filter) => { Live(ref root, ref filter) => {
let root = root.root(); let root = root.root();
root.traverse_preorder() HTMLCollection::traverse(*root)
.filter_map(|node| { .filter(|element| filter.filter(*element, *root))
let elem: Option<JSRef<Element>> = ElementCast::to_ref(node);
match elem {
Some(ref elem) if filter.filter(*elem, *root) => Some(elem.clone()),
_ => None
}
})
.find(|elem| { .find(|elem| {
elem.get_string_attribute(&atom!("name")) == key || elem.get_string_attribute(&atom!("name")) == key ||
elem.get_string_attribute(&atom!("id")) == key }) elem.get_string_attribute(&atom!("id")) == key })
.map(|maybe_elem| Temporary::from_rooted(maybe_elem)) .map(Temporary::from_rooted)
} }
} }
} }