Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make ChildrenIterator concrete.

Browse source 
This will allow us to specialize ChildrenIterator in the Gecko case to do
something more interesting in some cases.
This commit is contained in:
Bobby Holley 2016-08-10 15:07:36 -07:00
parent 470368ecce
commit b56297f2a5
3 changed files with 42 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/style/dom.rs
View file

@ -68,6 +68,7 @@ pub trait TNode : Sized + Copy + Clone {
type ConcreteElement: TElement<ConcreteNode = Self, ConcreteDocument = Self::ConcreteDocument>;
type ConcreteDocument: TDocument<ConcreteNode = Self, ConcreteElement = Self::ConcreteElement>;
type ConcreteRestyleDamage: TRestyleDamage;
type ConcreteChildrenIterator: Iterator<Item = Self>;
fn to_unsafe(&self) -> UnsafeNode;
unsafe fn from_unsafe(n: &UnsafeNode) -> Self;
@ -84,11 +85,7 @@ pub trait TNode : Sized + Copy + Clone {
fn dump_style(self);
/// Returns an iterator over this node's children.
fn children(self) -> ChildrenIterator<Self> {
ChildrenIterator {
current: self.first_child(),
}
}
fn children(self) -> Self::ConcreteChildrenIterator;
/// Converts self into an `OpaqueNode`.
fn opaque(&self) -> OpaqueNode;
@ -244,17 +241,3 @@ pub trait TElement : PartialEq + Debug + Sized + Copy + Clone + ElementExt + Pre
}
}
}
pub struct ChildrenIterator<ConcreteNode> where ConcreteNode: TNode {
current: Option<ConcreteNode>,
}
impl<ConcreteNode> Iterator for ChildrenIterator<ConcreteNode>
where ConcreteNode: TNode {
type Item = ConcreteNode;
fn next(&mut self) -> Option<ConcreteNode> {
let node = self.current;
self.current = node.and_then(|node| node.next_sibling());
node
}
}