Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

ChildElementIterator is now peekable

Browse source
This commit is contained in:
Bruno de Oliveira Abinader 2014-10-31 10:52:39 -04:00
parent eb1ef59aee
commit 11d2251b1e
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/script/dom/node.rs
View file

@ -59,7 +59,7 @@ use libc;
use libc::{uintptr_t, c_void}; use libc::{uintptr_t, c_void};
use std::cell::{Cell, RefCell, Ref, RefMut}; use std::cell::{Cell, RefCell, Ref, RefMut};
use std::default::Default; use std::default::Default;
use std::iter::{Map, Filter}; use std::iter::{Map, Filter, Peekable};
use std::mem; use std::mem;
use style; use style;
use style::ComputedValues; use style::ComputedValues;
@ -784,6 +784,7 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> {
let elem: JSRef<Element> = ElementCast::to_ref(node).unwrap(); let elem: JSRef<Element> = ElementCast::to_ref(node).unwrap();
elem.clone() elem.clone()
}) })
.peekable()
} }
fn wait_until_safe_to_modify_dom(self) { fn wait_until_safe_to_modify_dom(self) {
@ -966,9 +967,10 @@ impl RawLayoutNodeHelpers for Node {
// Iteration and traversal // Iteration and traversal
// //
pub type ChildElementIterator<'a> = Map<'a, JSRef<'a, Node>, pub type ChildElementIterator<'a> = Peekable<JSRef<'a, Element>,
JSRef<'a, Element>, Map<'a, JSRef<'a, Node>,
Filter<'a, JSRef<'a, Node>, NodeChildrenIterator<'a>>>; JSRef<'a, Element>,
Filter<'a, JSRef<'a, Node>, NodeChildrenIterator<'a>>>>;
pub struct NodeChildrenIterator<'a> { pub struct NodeChildrenIterator<'a> {
current: Option<JSRef<'a, Node>>, current: Option<JSRef<'a, Node>>,
@ -1258,9 +1260,7 @@ impl Node {
0 => (), 0 => (),
// Step 6.1.2 // Step 6.1.2
1 => { 1 => {
// FIXME: change to empty() when https://github.com/mozilla/rust/issues/11218 if parent.child_elements().peek().is_some() {
// will be fixed
if parent.child_elements().count() > 0 {
return Err(HierarchyRequest); return Err(HierarchyRequest);
} }
match child { match child {
@ -1279,9 +1279,7 @@ impl Node {
}, },
// Step 6.2 // Step 6.2
ElementNodeTypeId(_) => { ElementNodeTypeId(_) => {
// FIXME: change to empty() when https://github.com/mozilla/rust/issues/11218 if parent.child_elements().peek().is_some() {
// will be fixed
if parent.child_elements().count() > 0 {
return Err(HierarchyRequest); return Err(HierarchyRequest);
} }
match child { match child {
@ -1308,9 +1306,7 @@ impl Node {
} }
}, },
None => { None => {
// FIXME: change to empty() when https://github.com/mozilla/rust/issues/11218 if parent.child_elements().peek().is_some() {
// will be fixed
if parent.child_elements().count() > 0 {
return Err(HierarchyRequest); return Err(HierarchyRequest);
} }
}, },