auto merge of servo#2291 : saneyuki/servo/2287, r=jdm

Fix servo#2287
Ms2ger · May 2, 2014 · 803c922 · 803c922
2 parents b36b779 + 31cf10c
commit 803c922
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs
@@ -902,9 +902,7 @@ impl Node {
 
     // http://dom.spec.whatwg.org/#dom-node-parentelement
     pub fn GetParentElement(&self) -> Option<JS<Element>> {
-        self.parent_node.clone()
-                        .filtered(|parent| parent.is_element())
-                        .map(|node| ElementCast::to(&node).unwrap())
+        self.parent_node.clone().and_then(|parent| ElementCast::to(&parent))
     }
 
     // http://dom.spec.whatwg.org/#dom-node-haschildnodes