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

Simplify the implementation of NodeIterator::next_child.

Browse source
This commit is contained in:
Ms2ger 2014-11-02 18:04:03 +01:00
parent cb68fbd68e
commit 68f3daa7ef
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1050,15 +1050,13 @@ impl NodeIterator {
} }
fn next_child<'b>(&self, node: JSRef<'b, Node>) -> Option<JSRef<'b, Node>> { fn next_child<'b>(&self, node: JSRef<'b, Node>) -> Option<JSRef<'b, Node>> {
if !self.include_descendants_of_void && node.is_element() { let skip = |element: JSRef<Element>| {
let elem: JSRef<Element> = ElementCast::to_ref(node).unwrap(); !self.include_descendants_of_void && element.is_void()
if elem.is_void() { };
None
} else { match ElementCast::to_ref(node) {
node.first_child().map(|child| (*child.root()).clone()) Some(element) if skip(element) => None,
} _ => node.first_child().map(|child| (*child.root()).clone()),
} else {
node.first_child().map(|child| (*child.root()).clone())
} }
} }
} }