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

implemented iterator for child elements

Browse source
This commit is contained in:
Shamir Khodzha 2013-12-30 00:25:09 +04:00
parent be8ed32562
commit 8bb1724c1e
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/script/dom/document.rs
View file

@ -162,9 +162,7 @@ impl Reflectable for Document {
impl Document {
pub fn GetDocumentElement(&self) -> Option<AbstractNode> {
do self.node.children().find |c| {
c.is_element()
}
self.node.child_elements().next()
}
fn get_cx(&self) -> *JSContext {

23
src/components/script/dom/node.rs
View file

@ -25,6 +25,7 @@ use std::cast::transmute;
use std::cast;
use std::unstable::raw::Box;
use std::util;
use std::iter::Filter;
//
// The basic Node structure
@ -486,6 +487,10 @@ impl<'self> AbstractNode {
self.node().children()
}
pub fn child_elements(&self) -> Filter<AbstractNode, AbstractNodeChildrenIterator> {
self.node().child_elements()
}
pub fn is_in_doc(&self) -> bool {
self.node().flags.is_in_doc()
}
@ -749,6 +754,10 @@ impl Node {
}
}
pub fn child_elements(&self) -> Filter<AbstractNode, AbstractNodeChildrenIterator> {
self.children().filter(|node| node.is_element())
}
pub fn reflect_node<N: Reflectable>
(node: @mut N,
document: AbstractDocument,
@ -1041,11 +1050,13 @@ impl Node {
if node.children().any(|c| c.is_text()) {
return Err(HierarchyRequest);
}
match node.children().count(|c| c.is_element()) {
match node.child_elements().len() {
0 => (),
// Step 6.1.2
1 => {
if parent.children().any(|c| c.is_element()) {
// FIXME: change to empty() when https://github.com/mozilla/rust/issues/11218
// will be fixed
if parent.child_elements().len() > 0 {
return Err(HierarchyRequest);
}
if inclusively_followed_by_doctype(child) {
@ -1058,7 +1069,9 @@ impl Node {
},
// Step 6.2
ElementNodeTypeId(_) => {
if parent.children().any(|c| c.is_element()) {
// FIXME: change to empty() when https://github.com/mozilla/rust/issues/11218
// will be fixed
if parent.child_elements().len() > 0 {
return Err(HierarchyRequest);
}
if inclusively_followed_by_doctype(child) {
@ -1079,7 +1092,9 @@ impl Node {
}
},
None => {
if parent.children().any(|c| c.is_element()) {
// FIXME: change to empty() when https://github.com/mozilla/rust/issues/11218
// will be fixed
if parent.child_elements().len() > 0 {
return Err(HierarchyRequest);
}
},