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

Remove AbstractNode::followed_by_doctype and AbstractNode::inclusively_followed_by_doctype in favour of iterators over following siblings.

Browse source
This commit is contained in:
Ms2ger 2014-01-16 16:19:16 +01:00
parent ecaaf4c145
commit 1117e24334
1 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -266,29 +266,6 @@ impl AbstractNode {
pub fn is_parent_of(&self, child: AbstractNode) -> bool { pub fn is_parent_of(&self, child: AbstractNode) -> bool {
child.parent_node() == Some(*self) child.parent_node() == Some(*self)
} }
fn followed_by_doctype(child: AbstractNode) -> bool {
let mut iter = child;
loop {
match iter.next_sibling() {
Some(sibling) => {
if sibling.is_doctype() {
return true;
}
iter = sibling;
},
None => return false
}
}
}
fn inclusively_followed_by_doctype(child: Option<AbstractNode>) -> bool {
match child {
Some(child) if child.is_doctype() => true,
Some(child) => AbstractNode::followed_by_doctype(child),
None => false
}
}
} }
impl<'a> AbstractNode { impl<'a> AbstractNode {
@ -831,6 +808,18 @@ impl AbstractNode {
} }
} }
pub fn inclusively_following_siblings(&self) -> AbstractNodeChildrenIterator {
AbstractNodeChildrenIterator {
current_node: Some(*self),
}
}
pub fn following_siblings(&self) -> AbstractNodeChildrenIterator {
AbstractNodeChildrenIterator {
current_node: self.next_sibling(),
}
}
/// Iterates over this node and all its descendants, in preorder. /// Iterates over this node and all its descendants, in preorder.
pub fn traverse_preorder(&self) -> TreeIterator { pub fn traverse_preorder(&self) -> TreeIterator {
let mut nodes = ~[]; let mut nodes = ~[];
@ -1131,8 +1120,12 @@ impl Node {
if parent.child_elements().len() > 0 { if parent.child_elements().len() > 0 {
return Err(HierarchyRequest); return Err(HierarchyRequest);
} }
if AbstractNode::inclusively_followed_by_doctype(child) { match child {
return Err(HierarchyRequest); Some(child) if child.inclusively_following_siblings()
.any(|child| child.is_doctype()) => {
return Err(HierarchyRequest);
}
_ => (),
} }
}, },
// Step 6.1.1(a) // Step 6.1.1(a)
@ -1146,8 +1139,12 @@ impl Node {
if parent.child_elements().len() > 0 { if parent.child_elements().len() > 0 {
return Err(HierarchyRequest); return Err(HierarchyRequest);
} }
if AbstractNode::inclusively_followed_by_doctype(child) { match child {
return Err(HierarchyRequest); Some(child) if child.inclusively_following_siblings()
.any(|child| child.is_doctype()) => {
return Err(HierarchyRequest);
}
_ => (),
} }
}, },
// Step 6.3 // Step 6.3
@ -1406,7 +1403,8 @@ impl Node {
if parent.child_elements().any(|c| c != child) { if parent.child_elements().any(|c| c != child) {
return Err(HierarchyRequest); return Err(HierarchyRequest);
} }
if AbstractNode::followed_by_doctype(child) { if child.following_siblings()
.any(|child| child.is_doctype()) {
return Err(HierarchyRequest); return Err(HierarchyRequest);
} }
}, },
@ -1419,7 +1417,8 @@ impl Node {
if parent.child_elements().any(|c| c != child) { if parent.child_elements().any(|c| c != child) {
return Err(HierarchyRequest); return Err(HierarchyRequest);
} }
if AbstractNode::followed_by_doctype(child) { if child.following_siblings()
.any(|child| child.is_doctype()) {
return Err(HierarchyRequest); return Err(HierarchyRequest);
} }
}, },