1 files changed, 2 insertions, 20 deletions

diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs
index 10b2d953bc9..b44a1b400d8 100644
--- a/src/components/script/dom/htmldocument.rs
+++ b/src/components/script/dom/htmldocument.rs
@@ -10,8 +10,6 @@ use dom::htmlcollection::HTMLCollection;
 use dom::node::{AbstractNode, ScriptView};
 use dom::window::Window;
 
-use js::JSPROP_ENUMERATE;
-use js::glue::*;
 use js::jsapi::{JSObject, JSContext};
 
 use std::libc;
@@ -27,24 +25,8 @@ impl HTMLDocument {
             parent: Document::new(root, window, HTML)
         };
 
-        let cache = ptr::to_mut_unsafe_ptr(doc.get_wrappercache());
         let compartment = unsafe { (*window.get_ref().page).js_info.get_ref().js_compartment };
-        let abstract = AbstractDocument::as_abstract(compartment.cx.ptr, doc);
-        match window {
-            Some(win) => {
-              unsafe {
-                //FIXME: This is a hack until Window is autogenerated
-                let compartment = (*win.page).js_info.get_ref().js_compartment;
-                compartment.define_property(~"document",
-                                            RUST_OBJECT_TO_JSVAL((*cache).wrapper),
-                                            GetJSClassHookStubPointer(PROPERTY_STUB) as *u8,
-                                            GetJSClassHookStubPointer(STRICT_PROPERTY_STUB) as *u8,
-                                            JSPROP_ENUMERATE);
-              }
-            }
-            None => ()
-        }
-        abstract
+        AbstractDocument::as_abstract(compartment.cx.ptr, doc)
     }
 
     fn get_scope_and_cx(&self) -> (*JSObject, *JSContext) {
@@ -210,7 +192,7 @@ impl CacheableWrapper for HTMLDocument {
 }
 
 impl BindingObject for HTMLDocument {
-    fn GetParentObject(&self, cx: *JSContext) -> @mut CacheableWrapper {
+    fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> {
         self.parent.GetParentObject(cx)
     }
 }