Implement Document.createNodeIterator and rebase patch

3 files changed, 14 insertions, 9 deletions

diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 3d615df43de..b8ed26bbc90 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -58,6 +58,7 @@ use dom::keyboardevent::KeyboardEvent;
 use dom::messageevent::MessageEvent;
 use dom::node::{self, Node, NodeHelpers, NodeTypeId, CloneChildrenFlag, NodeDamage, window_from_node};
 use dom::nodelist::NodeList;
+use dom::nodeiterator::NodeIterator;
 use dom::text::Text;
 use dom::processinginstruction::ProcessingInstruction;
 use dom::range::Range;
@@ -1363,6 +1364,12 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
         Range::new_with_doc(self)
     }
 
+    // https://dom.spec.whatwg.org/#dom-document-createnodeiterator
+    fn CreateNodeIterator(self, root: JSRef<Node>, whatToShow: u32, filter: Option<NodeFilter>)
+                        -> Temporary<NodeIterator> {
+        NodeIterator::new(self, root, whatToShow, filter)
+    }
+
     // https://dom.spec.whatwg.org/#dom-document-createtreewalker
     fn CreateTreeWalker(self, root: JSRef<Node>, whatToShow: u32, filter: Option<NodeFilter>)
                         -> Temporary<TreeWalker> {
diff --git a/components/script/dom/nodeiterator.rs b/components/script/dom/nodeiterator.rs
index 33e630bd8cf..5d2850228fe 100644
--- a/components/script/dom/nodeiterator.rs
+++ b/components/script/dom/nodeiterator.rs
@@ -7,18 +7,16 @@ use dom::bindings::codegen::Bindings::NodeIteratorBinding::NodeIteratorMethods;
 use dom::bindings::codegen::Bindings::NodeFilterBinding::NodeFilter;
 use dom::bindings::error::Fallible;
 use dom::bindings::global::GlobalRef;
-use dom::bindings::js::{JS, JSRef, Temporary};
-use dom::bindings::js::MutNullableJS;
+use dom::bindings::js::{JS, JSRef, MutNullableHeap, Temporary, Rootable};
 use dom::bindings::utils::{Reflector, reflect_dom_object};
 use dom::document::{Document, DocumentHelpers};
 use dom::node::{Node};
-use std::default::Default;
 
 #[dom_struct]
 pub struct NodeIterator {
     reflector_: Reflector,
     root_node: JS<Node>,
-    reference_node: MutNullableJS<Node>,
+    reference_node: MutNullableHeap<JS<Node>>,
     what_to_show: u32,
     filter: Filter
 }
@@ -30,7 +28,7 @@ impl NodeIterator {
         NodeIterator {
             reflector_: Reflector::new(),
             root_node: JS::from_rooted(root_node),
-            reference_node: Default::default(),
+            reference_node: MutNullableHeap::new(Some(JS::from_rooted(root_node))),
             what_to_show: what_to_show,
             filter: filter
         }
@@ -61,7 +59,7 @@ impl NodeIterator {
 impl<'a> NodeIteratorMethods for JSRef<'a, NodeIterator> {
     // https://dom.spec.whatwg.org/#dom-nodeiterator-root
     fn Root(self) -> Temporary<Node> {
-        Temporary::new(self.root_node)
+        Temporary::from_rooted(self.root_node)
     }
 
     // https://dom.spec.whatwg.org/#dom-nodeiterator-whattoshow
@@ -80,7 +78,7 @@ impl<'a> NodeIteratorMethods for JSRef<'a, NodeIterator> {
 
     // https://dom.spec.whatwg.org/#dom-nodeiterator-referencenode
     fn GetReferenceNode(self) -> Option<Temporary<Node>> {
-        self.reference_node.get()
+        self.reference_node.get().map(Temporary::from_rooted)
     }
 
     // https://dom.spec.whatwg.org/#dom-nodeiterator-previousnode
diff --git a/components/script/dom/webidls/Document.webidl b/components/script/dom/webidls/Document.webidl
index 581ad401f6d..687650a6c3a 100644
--- a/components/script/dom/webidls/Document.webidl
+++ b/components/script/dom/webidls/Document.webidl
@@ -58,8 +58,8 @@ interface Document : Node {
   Range createRange();
 
   // NodeFilter.SHOW_ALL = 0xFFFFFFFF
-  // [NewObject]
-  // NodeIterator createNodeIterator(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null);
+  [NewObject]
+  NodeIterator createNodeIterator(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null);
   [NewObject]
   TreeWalker createTreeWalker(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null);
 };