2 files changed, 7 insertions, 6 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index 8ac195ef5e1..71c46b09119 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -2599,8 +2599,12 @@ def CreateBindingJSObject(descriptor, parent=None):
 class CGWrapMethod(CGAbstractMethod):
     def __init__(self, descriptor):
         assert descriptor.interface.hasInterfacePrototypeObject()
-        args = [Argument('*JSContext', 'aCx'), Argument('*JSObject', 'aScope'),
-                Argument(DOMObjectPointerArg(descriptor), 'aObject', mutable=True)]
+        if not descriptor.createGlobal:
+            args = [Argument('*JSContext', 'aCx'), Argument('*JSObject', 'aScope'),
+                    Argument(DOMObjectPointerArg(descriptor), 'aObject', mutable=True)]
+        else:
+            args = [Argument('*JSContext', 'aCx'),
+                    Argument(DOMObjectPointerArg(descriptor), 'aObject', mutable=True)]
         CGAbstractMethod.__init__(self, descriptor, 'Wrap', '*JSObject', args, pub=True)
 
     def definition_body(self):
@@ -2622,8 +2626,6 @@ class CGWrapMethod(CGAbstractMethod):
   return obj;""" % CreateBindingJSObject(self.descriptor, "aScope")
         else:
             return """
-  assert!(aScope.is_null());
-
 %s
   let proto = GetProtoObject(aCx, obj, obj);
   JS_SetPrototype(aCx, obj, proto);
diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs
index 68a9e3364b9..884e691fab7 100644
--- a/src/components/script/dom/window.rs
+++ b/src/components/script/dom/window.rs
@@ -29,7 +29,6 @@ use std::comm::Select;
 use std::hashmap::HashSet;
 use std::io::timer::Timer;
 use std::num;
-use std::ptr;
 use std::rc::Rc;
 use std::to_bytes::Cb;
 
@@ -311,7 +310,7 @@ impl Window {
         };
 
         let raw: *mut Window = &mut *win;
-        let global = WindowBinding::Wrap(cx, ptr::null(), win);
+        let global = WindowBinding::Wrap(cx, win);
         assert!(global.is_not_null());
         unsafe {
             let fn_names = ["window","self"];