Auto merge of #16054 - vypr:master, r=Wafflespeanut

Making a few lines in layout_wrapper.rs a bit nicer, fixing #15811.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16054)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-03-20 20:15:31 -07:00 committed by GitHub
commit 3b15efd2ba

View file

@ -933,11 +933,12 @@ impl<ConcreteNode> Iterator for ThreadSafeLayoutNodeChildrenIterator<ConcreteNod
let mut current_node = self.current_node.clone(); let mut current_node = self.current_node.clone();
loop { loop {
let next_node = if let Some(ref node) = current_node { let next_node = if let Some(ref node) = current_node {
if node.is_element() && if let Some(element) = node.as_element() {
node.as_element().unwrap().get_local_name() == &local_name!("summary") && if element.get_local_name() == &local_name!("summary") &&
node.as_element().unwrap().get_namespace() == &ns!(html) { element.get_namespace() == &ns!(html) {
self.current_node = None; self.current_node = None;
return Some(node.clone()); return Some(node.clone());
}
} }
unsafe { node.dangerous_next_sibling() } unsafe { node.dangerous_next_sibling() }
} else { } else {