Implement more NodeIterator attribute and methods

Just implement the skelectons - referenceNode attribute - nextNode() and previousNode()
servo · May 27, 2015 · 0e4c792 · 0e4c792
1 parent 2701c26
commit 0e4c792
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 6 deletions.
diff --git a/components/script/dom/nodeiterator.rs b/components/script/dom/nodeiterator.rs
@@ -5,16 +5,20 @@
 use dom::bindings::codegen::Bindings::NodeIteratorBinding;
 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::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>,
     what_to_show: u32,
     filter: Filter
 }
@@ -26,6 +30,7 @@ impl NodeIterator {
         NodeIterator {
             reflector_: Reflector::new(),
             root_node: JS::from_rooted(root_node),
+            reference_node: Default::default(),
             what_to_show: what_to_show,
             filter: filter
         }
@@ -73,8 +78,46 @@ 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()
+    }
+
+    // https://dom.spec.whatwg.org/#dom-nodeiterator-previousnode
+    fn PreviousNode(self) -> Fallible<Option<Temporary<Node>>> {
+        self.prev_node()
+    }
+
+    // https://dom.spec.whatwg.org/#dom-nodeiterator-nextnode
+    fn NextNode(self) -> Fallible<Option<Temporary<Node>>> {
+        self.next_node()
+    }
+}
+
+/*
+trait PrivateNodeIteratorHelpers {
+    //fn accept_node(self, node: JSRef<Node>) -> Fallible<u16>;
+}
+*/
+pub trait NodeIteratorHelpers {
+    fn next_node(self) -> Fallible<Option<Temporary<Node>>>;
+    fn prev_node(self) -> Fallible<Option<Temporary<Node>>>;
 }
 
+impl<'a> NodeIteratorHelpers for JSRef<'a, NodeIterator> {
+    // https://dom.spec.whatwg.org/#dom-nodeiterator-nextnode
+    fn next_node(self) -> Fallible<Option<Temporary<Node>>> {
+        Ok(None)
+    }
+
+    // https://dom.spec.whatwg.org/#dom-nodeiterator-previousnode
+    fn prev_node(self) -> Fallible<Option<Temporary<Node>>> {
+        Ok(None)
+    }
+
+}
+
+
 #[jstraceable]
 pub enum Filter {
     None,

diff --git a/components/script/dom/webidls/NodeIterator.webidl b/components/script/dom/webidls/NodeIterator.webidl
@@ -14,19 +14,19 @@
 interface NodeIterator {
   [Constant]
   readonly attribute Node root;
-  // [Pure]
-  // readonly attribute Node? referenceNode;
+  [Pure]
+  readonly attribute Node? referenceNode;
   // [Pure]
   // readonly attribute boolean pointerBeforeReferenceNode;
   [Constant]
   readonly attribute unsigned long whatToShow;
   [Constant]
   readonly attribute NodeFilter? filter;
 
-  // [Throws]
-  // Node? nextNode();
-  // [Throws]
-  // Node? previousNode();
+  [Throws]
+  Node? nextNode();
+  [Throws]
+  Node? previousNode();
 
   // void detach();
 };