aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/nodeiterator.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom/nodeiterator.rs')
-rw-r--r--components/script/dom/nodeiterator.rs9
1 files changed, 3 insertions, 6 deletions
diff --git a/components/script/dom/nodeiterator.rs b/components/script/dom/nodeiterator.rs
index d9e46a5ea44..920d94d635c 100644
--- a/components/script/dom/nodeiterator.rs
+++ b/components/script/dom/nodeiterator.rs
@@ -9,7 +9,7 @@ use dom::bindings::codegen::Bindings::NodeFilterBinding::NodeFilterConstants;
use dom::bindings::codegen::Bindings::NodeIteratorBinding;
use dom::bindings::codegen::Bindings::NodeIteratorBinding::NodeIteratorMethods;
use dom::bindings::error::Fallible;
-use dom::bindings::js::{JS, MutHeap, Root};
+use dom::bindings::js::{JS, MutJS, Root};
use dom::bindings::reflector::{Reflector, reflect_dom_object};
use dom::document::Document;
use dom::node::Node;
@@ -21,7 +21,7 @@ pub struct NodeIterator {
reflector_: Reflector,
root_node: JS<Node>,
#[ignore_heap_size_of = "Defined in rust-mozjs"]
- reference_node: MutHeap<JS<Node>>,
+ reference_node: MutJS<Node>,
pointer_before_reference_node: Cell<bool>,
what_to_show: u32,
#[ignore_heap_size_of = "Can't measure due to #6870"]
@@ -35,7 +35,7 @@ impl NodeIterator {
NodeIterator {
reflector_: Reflector::new(),
root_node: JS::from_ref(root_node),
- reference_node: MutHeap::new(root_node),
+ reference_node: MutJS::new(root_node),
pointer_before_reference_node: Cell::new(true),
what_to_show: what_to_show,
filter: filter
@@ -79,7 +79,6 @@ impl NodeIteratorMethods for NodeIterator {
match self.filter {
Filter::None => None,
Filter::Callback(ref nf) => Some((*nf).clone()),
- Filter::Native(_) => panic!("Cannot convert native node filter to DOM NodeFilter")
}
}
@@ -200,7 +199,6 @@ impl NodeIterator {
// Step 3-5.
match self.filter {
Filter::None => Ok(NodeFilterConstants::FILTER_ACCEPT),
- Filter::Native(f) => Ok((f)(node)),
Filter::Callback(ref callback) => callback.AcceptNode_(self, node, Rethrow)
}
}
@@ -210,6 +208,5 @@ impl NodeIterator {
#[derive(JSTraceable)]
pub enum Filter {
None,
- Native(fn (node: &Node) -> u16),
Callback(Rc<NodeFilter>)
}