Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove DOMObjectPointerType.

Browse source
This commit is contained in:
Ms2ger 2014-03-10 19:57:11 +01:00
parent 986664f527
commit 493227c938
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -1857,12 +1857,6 @@ class CGAbstractMethod(CGThing):
def definition_body(self): def definition_body(self):
assert(False) # Override me! assert(False) # Override me!
def DOMObjectPointerType(descriptor):
return "~"
def DOMObjectPointerArg(descriptor):
return DOMObjectPointerType(descriptor) + descriptor.concreteType
def CreateBindingJSObject(descriptor, parent=None): def CreateBindingJSObject(descriptor, parent=None):
create = " let mut raw: JS<%s> = JS::from_raw(&mut *aObject);\n" % descriptor.concreteType create = " let mut raw: JS<%s> = JS::from_raw(&mut *aObject);\n" % descriptor.concreteType
if descriptor.proxy: if descriptor.proxy:
@ -1895,10 +1889,10 @@ class CGWrapMethod(CGAbstractMethod):
assert descriptor.interface.hasInterfacePrototypeObject() assert descriptor.interface.hasInterfacePrototypeObject()
if not descriptor.createGlobal: if not descriptor.createGlobal:
args = [Argument('*JSContext', 'aCx'), Argument('&JS<Window>', 'aScope'), args = [Argument('*JSContext', 'aCx'), Argument('&JS<Window>', 'aScope'),
Argument(DOMObjectPointerArg(descriptor), 'aObject', mutable=True)] Argument("~" + descriptor.concreteType, 'aObject', mutable=True)]
else: else:
args = [Argument('*JSContext', 'aCx'), args = [Argument('*JSContext', 'aCx'),
Argument(DOMObjectPointerArg(descriptor), 'aObject', mutable=True)] Argument("~" + descriptor.concreteType, 'aObject', mutable=True)]
retval = 'JS<%s>' % descriptor.concreteType retval = 'JS<%s>' % descriptor.concreteType
CGAbstractMethod.__init__(self, descriptor, 'Wrap', retval, args, pub=True) CGAbstractMethod.__init__(self, descriptor, 'Wrap', retval, args, pub=True)
@ -3931,9 +3925,9 @@ class CGAbstractClassHook(CGAbstractExternMethod):
def finalizeHook(descriptor, hookName, context): def finalizeHook(descriptor, hookName, context):
release = """let val = JS_GetReservedSlot(obj, dom_object_slot(obj)); release = """let val = JS_GetReservedSlot(obj, dom_object_slot(obj));
let _: %s %s = cast::transmute(val.to_private()); let _: ~%s = cast::transmute(val.to_private());
debug!("%s finalize: {:p}", this); debug!("%s finalize: {:p}", this);
""" % (DOMObjectPointerType(descriptor), descriptor.concreteType, descriptor.concreteType) """ % (descriptor.concreteType, descriptor.concreteType)
return release return release
class CGClassTraceHook(CGAbstractClassHook): class CGClassTraceHook(CGAbstractClassHook):