Implement NonDocumentTypeChildNode::*ElementSibling()

components/script/dom/characterdata.rs

@@ -6,11 +6,13 @@
 
 use dom::bindings::cell::DOMRefCell;
 use dom::bindings::codegen::Bindings::CharacterDataBinding::CharacterDataMethods;
-use dom::bindings::codegen::InheritTypes::{CharacterDataDerived, NodeCast};
+use dom::bindings::codegen::InheritTypes::{CharacterDataDerived, ElementCast};
+use dom::bindings::codegen::InheritTypes::NodeCast;
 use dom::bindings::error::{Fallible, ErrorResult};
 use dom::bindings::error::Error::IndexSize;
-use dom::bindings::js::JSRef;
+use dom::bindings::js::{JSRef, Temporary};
 use dom::document::Document;
+use dom::element::Element;
 use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::node::{Node, NodeHelpers, NodeTypeId};
 
@@ -127,5 +129,17 @@ impl<'a> CharacterDataMethods for JSRef<'a, CharacterData> {
         let node: JSRef<Node> = NodeCast::from_ref(self);
         node.remove_self();
     }
+
+    // https://dom.spec.whatwg.org/#dom-nondocumenttypechildnode-previouselementsibling
+    fn GetPreviousElementSibling(self) -> Option<Temporary<Element>> {
+        NodeCast::from_ref(self).preceding_siblings()
+                                .filter_map(ElementCast::to_temporary).next()
+    }
+
+    // https://dom.spec.whatwg.org/#dom-nondocumenttypechildnode-nextelementsibling
+    fn GetNextElementSibling(self) -> Option<Temporary<Element>> {
+        NodeCast::from_ref(self).following_siblings()
+                                .filter_map(ElementCast::to_temporary).next()
+    }
 }
 

components/script/dom/element.rs

@@ -1178,6 +1178,18 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
         Ok(())
     }
 
+    // https://dom.spec.whatwg.org/#dom-nondocumenttypechildnode-previouselementsibling
+    fn GetPreviousElementSibling(self) -> Option<Temporary<Element>> {
+        NodeCast::from_ref(self).preceding_siblings()
+                                .filter_map(ElementCast::to_temporary).next()
+    }
+
+    // https://dom.spec.whatwg.org/#dom-nondocumenttypechildnode-nextelementsibling
+    fn GetNextElementSibling(self) -> Option<Temporary<Element>> {
+        NodeCast::from_ref(self).following_siblings()
+                                .filter_map(ElementCast::to_temporary).next()
+    }
+
     // http://dom.spec.whatwg.org/#dom-parentnode-children
     fn Children(self) -> Temporary<HTMLCollection> {
         let window = window_from_node(self).root();

components/script/dom/node.rs

@@ -415,6 +415,7 @@ pub trait NodeHelpers<'a> {
     fn rev_children(self) -> ReverseChildrenIterator;
     fn child_elements(self) -> ChildElementIterator;
     fn following_siblings(self) -> NodeChildrenIterator;
+    fn preceding_siblings(self) -> ReverseChildrenIterator;
     fn is_in_doc(self) -> bool;
     fn is_inclusive_ancestor_of(self, parent: JSRef<Node>) -> bool;
     fn is_parent_of(self, child: JSRef<Node>) -> bool;
@@ -764,6 +765,12 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> {
         }
     }
 
+    fn preceding_siblings(self) -> ReverseChildrenIterator {
+        ReverseChildrenIterator {
+            current: self.prev_sibling(),
+        }
+    }
+
     fn is_parent_of(self, child: JSRef<Node>) -> bool {
         match child.parent_node() {
             Some(ref parent) if parent == &Temporary::from_rooted(self) => true,

components/script/dom/webidls/CharacterData.webidl

@@ -26,3 +26,4 @@ interface CharacterData : Node {
 };
 
 CharacterData implements ChildNode;
+CharacterData implements NonDocumentTypeChildNode;

components/script/dom/webidls/ChildNode.webidl

@@ -16,10 +16,10 @@ interface ChildNode {
   void remove();
 };
 
-// [NoInterfaceObject]
-// interface NonDocumentTypeChildNode {
-//   [Pure]
-//   readonly attribute Element? previousElementSibling;
-//   [Pure]
-//   readonly attribute Element? nextElementSibling;
-// };
+[NoInterfaceObject]
+interface NonDocumentTypeChildNode {
+  [Pure]
+  readonly attribute Element? previousElementSibling;
+  [Pure]
+  readonly attribute Element? nextElementSibling;
+};

components/script/dom/webidls/Element.webidl

@@ -70,4 +70,5 @@ partial interface Element {
 };
 
 Element implements ChildNode;
+Element implements NonDocumentTypeChildNode;
 Element implements ParentNode;