auto merge of #1016 : Ms2ger/servo/ownerdoc, r=jdm

1 files changed, 15 insertions, 10 deletions

diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs
index 6e70ad236a5..c96785bdc99 100644
--- a/src/components/script/dom/htmldocument.rs
+++ b/src/components/script/dom/htmldocument.rs
@@ -24,9 +24,9 @@ pub struct HTMLDocument {
 }
 
 impl HTMLDocument {
-    pub fn new(root: AbstractNode<ScriptView>, window: Option<@mut Window>) -> AbstractDocument {
+    pub fn new(window: Option<@mut Window>) -> AbstractDocument {
         let doc = @mut HTMLDocument {
-            parent: Document::new(root, window, HTML)
+            parent: Document::new(window, HTML)
         };
 
         let compartment = window.get_ref().page.js_info.get_ref().js_compartment;
@@ -70,14 +70,19 @@ impl HTMLDocument {
     }
 
     pub fn GetHead(&self) -> Option<AbstractNode<ScriptView>> {
-        let mut headNode: Option<AbstractNode<ScriptView>> = None;
-        let _ = for child in self.parent.root.traverse_preorder() {
-            if child.type_id() == ElementNodeTypeId(HTMLHeadElementTypeId) {
-                headNode = Some(child);
-                break;
+        match self.parent.root {
+            None => None,
+            Some(root) => {
+                let mut headNode: Option<AbstractNode<ScriptView>> = None;
+                let _ = for child in root.traverse_preorder() {
+                    if child.type_id() == ElementNodeTypeId(HTMLHeadElementTypeId) {
+                        headNode = Some(child);
+                        break;
+                    }
+                };
+                headNode 
             }
-        };
-        headNode 
+        }
     }
 
     pub fn Images(&self) -> @mut HTMLCollection {
@@ -216,4 +221,4 @@ impl Traceable for HTMLDocument {
     fn trace(&self, tracer: *mut JSTracer) {
         self.parent.trace(tracer);
     }
-}
\ No newline at end of file
+}