From 205b4e3f391264c985bd61350288049abc65d5ff Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Thu, 11 Dec 2014 11:26:23 +0100
Subject: [PATCH] Avoid some Option::unwrap calls in page.rs.

---
 components/script/page.rs | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/components/script/page.rs b/components/script/page.rs
index c8e46463077..a99f1b37c03 100644
--- a/components/script/page.rs
+++ b/components/script/page.rs
@@ -434,11 +434,10 @@ impl Page {
     pub fn hit_test(&self, point: &Point2D<f32>) -> Option<UntrustedNodeAddress> {
         let frame = self.frame();
         let document = frame.as_ref().unwrap().document.root();
-        let root = document.GetDocumentElement().root();
-        if root.is_none() {
-            return None;
-        }
-        let root = root.unwrap();
+        let root = match document.GetDocumentElement().root() {
+            None => return None,
+            Some(root) => root,
+        };
         let root: JSRef<Node> = NodeCast::from_ref(*root);
         let address = match self.layout().hit_test(root.to_trusted_node_address(), *point) {
             Ok(HitTestResponse(node_address)) => {
@@ -455,11 +454,10 @@ impl Page {
     pub fn get_nodes_under_mouse(&self, point: &Point2D<f32>) -> Option<Vec<UntrustedNodeAddress>> {
         let frame = self.frame();
         let document = frame.as_ref().unwrap().document.root();
-        let root = document.GetDocumentElement().root();
-        if root.is_none() {
-            return None;
-        }
-        let root = root.unwrap();
+        let root = match document.GetDocumentElement().root() {
+            None => return None,
+            Some(root) => root,
+        };
         let root: JSRef<Node> = NodeCast::from_ref(*root);
         let address = match self.layout().mouse_over(root.to_trusted_node_address(), *point) {
             Ok(MouseOverResponse(node_address)) => {