From e7c11f706228e45c5f75f6a2a8b792e3fd9429ac Mon Sep 17 00:00:00 2001 From: Peter Date: Thu, 9 Apr 2015 16:27:25 -0400 Subject: [PATCH] Updated fix #5616, also renamed RevsereChildrenIterator to ReverseSiblingIterator --- components/script/dom/node.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 1249aec902a6..aa06df6d1035 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -411,10 +411,10 @@ pub trait NodeHelpers<'a> { fn ancestors(self) -> AncestorIterator; fn inclusive_ancestors(self) -> AncestorIterator; fn children(self) -> NodeSiblingIterator; - fn rev_children(self) -> ReverseChildrenIterator; + fn rev_children(self) -> ReverseSiblingIterator; fn child_elements(self) -> ChildElementIterator; fn following_siblings(self) -> NodeSiblingIterator; - fn preceding_siblings(self) -> ReverseChildrenIterator; + fn preceding_siblings(self) -> ReverseSiblingIterator; fn is_in_doc(self) -> bool; fn is_inclusive_ancestor_of(self, parent: JSRef) -> bool; fn is_parent_of(self, child: JSRef) -> bool; @@ -764,8 +764,8 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> { } } - fn preceding_siblings(self) -> ReverseChildrenIterator { - ReverseChildrenIterator { + fn preceding_siblings(self) -> ReverseSiblingIterator { + ReverseSiblingIterator { current: self.prev_sibling(), } } @@ -872,8 +872,8 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> { } } - fn rev_children(self) -> ReverseChildrenIterator { - ReverseChildrenIterator { + fn rev_children(self) -> ReverseSiblingIterator { + ReverseSiblingIterator { current: self.last_child(), } } @@ -1138,11 +1138,11 @@ impl Iterator for NodeSiblingIterator { } } -pub struct ReverseChildrenIterator { +pub struct ReverseSiblingIterator { current: Option>, } -impl Iterator for ReverseChildrenIterator { +impl Iterator for ReverseSiblingIterator { type Item = Temporary; fn next(&mut self) -> Option> {