Upgrade to SM 39

components/script/dom/bindings/codegen/Bindings.conf

@@ -15,7 +15,7 @@
 DOMInterfaces = {
 
 'Window': {
-    'outerObjectHook': 'Some(bindings::utils::outerize_global as extern fn(*mut JSContext, JSHandleObject) -> *mut JSObject)',
+    'outerObjectHook': 'Some(bindings::utils::outerize_global)',
 },
 
 #FIXME(jdm): This should be 'register': False, but then we don't generate enum types

components/script/dom/bindings/codegen/Configuration.py

@@ -148,16 +148,16 @@ class Descriptor(DescriptorProvider):
         if self.interface.isCallback():
             self.needsRooting = False
             ty = "%sBinding::%s" % (ifaceName, ifaceName)
-            self.returnType = ty
+            self.returnType = "Rc<%s>"% ty
             self.argumentType = "???"
             self.memberType = "???"
             self.nativeType = ty
         else:
             self.needsRooting = True
-            self.returnType = "Temporary<%s>" % ifaceName
-            self.argumentType = "JSRef<%s>" % ifaceName
+            self.returnType = "Root<%s>" % ifaceName
+            self.argumentType = "&%s" % ifaceName
             self.memberType = "Root<%s>" % ifaceName
-            self.nativeType = "Unrooted<%s>" % ifaceName
+            self.nativeType = "Root<%s>" % ifaceName
 
         self.concreteType = ifaceName
         self.register = desc.get('register', True)