Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-02 12:10:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

Just pass global to CreateInterfaceObjects

Browse source 
The receiver parameter is useless here.
This commit is contained in:
Anthony Ramine 2016-01-21 02:00:15 +01:00
parent 96e28086e3
commit 0af373cef6
1 changed files with 13 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

35
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -2253,7 +2253,7 @@ assert!(((*JS_GetClass(scope.get())).flags & JSCLASS_IS_GLOBAL) != 0);
let mut proto = RootedObject::new(cx, ptr::null_mut()); let mut proto = RootedObject::new(cx, ptr::null_mut());
let _ac = JSAutoCompartment::new(cx, scope.get()); let _ac = JSAutoCompartment::new(cx, scope.get());
GetProtoObject(cx, scope, scope, proto.handle_mut()); GetProtoObject(cx, scope, proto.handle_mut());
assert!(!proto.ptr.is_null()); assert!(!proto.ptr.is_null());
%(createObject)s %(createObject)s
@ -2270,7 +2270,7 @@ let _ar = JSAutoRequest::new(cx);
let _ac = JSAutoCompartment::new(cx, obj.ptr); let _ac = JSAutoCompartment::new(cx, obj.ptr);
let mut proto = RootedObject::new(cx, ptr::null_mut()); let mut proto = RootedObject::new(cx, ptr::null_mut());
GetProtoObject(cx, obj.handle(), obj.handle(), proto.handle_mut()); GetProtoObject(cx, obj.handle(), proto.handle_mut());
JS_SetPrototype(cx, obj.handle(), proto.handle()); JS_SetPrototype(cx, obj.handle(), proto.handle());
%(copyUnforgeable)s %(copyUnforgeable)s
@ -2375,11 +2375,9 @@ class CGCreateInterfaceObjectsMethod(CGAbstractMethod):
properties should be a PropertyArrays instance. properties should be a PropertyArrays instance.
""" """
def __init__(self, descriptor, properties): def __init__(self, descriptor, properties):
args = [Argument('*mut JSContext', 'cx')] args = [Argument('*mut JSContext', 'cx'), Argument('HandleObject', 'global')]
if not descriptor.interface.isCallback(): if not descriptor.interface.isCallback():
args += [Argument('HandleObject', 'global'), args.append(Argument('*mut ProtoOrIfaceArray', 'cache'))
Argument('*mut ProtoOrIfaceArray', 'cache')]
args.append(Argument('HandleObject', 'receiver'))
CGAbstractMethod.__init__(self, descriptor, 'CreateInterfaceObjects', 'void', args, CGAbstractMethod.__init__(self, descriptor, 'CreateInterfaceObjects', 'void', args,
unsafe=True) unsafe=True)
self.properties = properties self.properties = properties
@ -2389,7 +2387,7 @@ class CGCreateInterfaceObjectsMethod(CGAbstractMethod):
if self.descriptor.interface.isCallback(): if self.descriptor.interface.isCallback():
assert not self.descriptor.interface.ctor() and self.descriptor.interface.hasConstants() assert not self.descriptor.interface.ctor() and self.descriptor.interface.hasConstants()
return CGGeneric("""\ return CGGeneric("""\
create_callback_interface_object(cx, receiver, sConstants, %s);""" % str_to_const_array(name)) create_callback_interface_object(cx, global, sConstants, %s);""" % str_to_const_array(name))
if len(self.descriptor.prototypeChain) == 1: if len(self.descriptor.prototypeChain) == 1:
if self.descriptor.interface.getExtendedAttribute("ExceptionClass"): if self.descriptor.interface.getExtendedAttribute("ExceptionClass"):
@ -2397,7 +2395,7 @@ create_callback_interface_object(cx, receiver, sConstants, %s);""" % str_to_cons
else: else:
getPrototypeProto = "prototype_proto.ptr = JS_GetObjectPrototype(cx, global)" getPrototypeProto = "prototype_proto.ptr = JS_GetObjectPrototype(cx, global)"
else: else:
getPrototypeProto = ("%s::GetProtoObject(cx, global, receiver, prototype_proto.handle_mut())" % getPrototypeProto = ("%s::GetProtoObject(cx, global, prototype_proto.handle_mut())" %
toBindingNamespace(self.descriptor.prototypeChain[-2])) toBindingNamespace(self.descriptor.prototypeChain[-2]))
code = [CGGeneric("""\ code = [CGGeneric("""\
@ -2445,7 +2443,7 @@ if <*mut JSObject>::needs_post_barrier(prototype.ptr) {
parentName = toBindingNamespace(self.descriptor.getParentName()) parentName = toBindingNamespace(self.descriptor.getParentName())
code.append(CGGeneric(""" code.append(CGGeneric("""
let mut interface_proto = RootedObject::new(cx, ptr::null_mut()); let mut interface_proto = RootedObject::new(cx, ptr::null_mut());
%s::GetConstructorObject(cx, global, receiver, interface_proto.handle_mut());""" % parentName)) %s::GetConstructorObject(cx, global, interface_proto.handle_mut());""" % parentName))
else: else:
code.append(CGGeneric(""" code.append(CGGeneric("""
let interface_proto = RootedObject::new(cx, JS_GetFunctionPrototype(cx, global));""")) let interface_proto = RootedObject::new(cx, JS_GetFunctionPrototype(cx, global));"""))
@ -2454,7 +2452,7 @@ assert!(!interface_proto.ptr.is_null());
let mut interface = RootedObject::new(cx, ptr::null_mut()); let mut interface = RootedObject::new(cx, ptr::null_mut());
create_noncallback_interface_object(cx, create_noncallback_interface_object(cx,
receiver, global,
interface_proto.handle(), interface_proto.handle(),
&InterfaceObjectClass, &InterfaceObjectClass,
%(static_methods)s, %(static_methods)s,
@ -2483,7 +2481,7 @@ if <*mut JSObject>::needs_post_barrier(prototype.ptr) {
specs.append(CGGeneric("(%s as NonNullJSNative, %s, %d)" % (hook, name, length))) specs.append(CGGeneric("(%s as NonNullJSNative, %s, %d)" % (hook, name, length)))
values = CGIndenter(CGList(specs, "\n"), 4) values = CGIndenter(CGList(specs, "\n"), 4)
code.append(CGWrapper(values, pre="%s = [\n" % decl, post="\n];")) code.append(CGWrapper(values, pre="%s = [\n" % decl, post="\n];"))
code.append(CGGeneric("create_named_constructors(cx, receiver, &named_constructors, prototype.handle());")) code.append(CGGeneric("create_named_constructors(cx, global, &named_constructors, prototype.handle());"))
if self.descriptor.hasUnforgeableMembers: if self.descriptor.hasUnforgeableMembers:
# We want to use the same JSClass and prototype as the object we'll # We want to use the same JSClass and prototype as the object we'll
@ -2523,8 +2521,8 @@ class CGGetPerInterfaceObject(CGAbstractMethod):
constructor object). constructor object).
""" """
def __init__(self, descriptor, name, idPrefix="", pub=False): def __init__(self, descriptor, name, idPrefix="", pub=False):
args = [Argument('*mut JSContext', 'cx'), Argument('HandleObject', 'global'), args = [Argument('*mut JSContext', 'cx'),
Argument('HandleObject', 'receiver'), Argument('HandleObject', 'global'),
Argument('MutableHandleObject', 'rval')] Argument('MutableHandleObject', 'rval')]
CGAbstractMethod.__init__(self, descriptor, name, CGAbstractMethod.__init__(self, descriptor, name,
'void', args, pub=pub, unsafe=True) 'void', args, pub=pub, unsafe=True)
@ -2532,13 +2530,6 @@ class CGGetPerInterfaceObject(CGAbstractMethod):
def definition_body(self): def definition_body(self):
return CGGeneric(""" return CGGeneric("""
/* global and receiver are usually the same, but they can be different
too. For example a sandbox often has an xray wrapper for a window as the
prototype of the sandbox's global. In that case receiver is the xray
wrapper and global is the sandbox's global.
*/
assert!(((*JS_GetClass(global.get())).flags & JSCLASS_DOM_GLOBAL) != 0); assert!(((*JS_GetClass(global.get())).flags & JSCLASS_DOM_GLOBAL) != 0);
/* Check to see whether the interface objects are already installed */ /* Check to see whether the interface objects are already installed */
@ -2548,7 +2539,7 @@ if !rval.get().is_null() {
return; return;
} }
CreateInterfaceObjects(cx, global, proto_or_iface_array, receiver); CreateInterfaceObjects(cx, global, proto_or_iface_array);
rval.set((*proto_or_iface_array)[%(id)s as usize]); rval.set((*proto_or_iface_array)[%(id)s as usize]);
assert!(!rval.get().is_null()); assert!(!rval.get().is_null());
""" % {"id": self.id}) """ % {"id": self.id})
@ -2670,7 +2661,7 @@ class CGDefineDOMInterfaceMethod(CGAbstractMethod):
else: else:
code = """\ code = """\
let mut proto = RootedObject::new(cx, ptr::null_mut()); let mut proto = RootedObject::new(cx, ptr::null_mut());
GetProtoObject(cx, global, global, proto.handle_mut()); GetProtoObject(cx, global, proto.handle_mut());
assert!(!proto.ptr.is_null()); assert!(!proto.ptr.is_null());
""" """
return CGGeneric("assert!(!global.get().is_null());\n" + code) return CGGeneric("assert!(!global.get().is_null());\n" + code)