diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-05-02 00:28:38 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-05-02 00:28:38 -0400 |
| commit | 803c922248c5e954819f9a19f18f739d9e2e87d1 (patch) | |
| tree | b54476cc88d2e4aeaaa5ca0a9139be08ccb3eda8 | |
| parent | b36b779d24c6f7425f630c18495dae4c6edec137 (diff) | |
| parent | 31cf10c006a537cbcb6df2e6bb419c4f6bcb0fb9 (diff) | |
| download | servo-803c922248c5e954819f9a19f18f739d9e2e87d1.tar.gz servo-803c922248c5e954819f9a19f18f739d9e2e87d1.zip | |
auto merge of #2291 : saneyuki/servo/2287, r=jdm
Fix #2287
| -rw-r--r-- | src/components/script/dom/node.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index 95c41e8b7d7..d5b43a6257f 100644 --- 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 |