From 12380edc63fa69c1ab2c84677a73d9cea9ceac50 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 4 Mar 2014 13:17:36 +0100 Subject: [PATCH] Merge the Wrap and Wrap_ functions in codegen. --- .../script/dom/bindings/codegen/CodegenRust.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 7492723eca4..8ac195ef5e1 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -2596,12 +2596,12 @@ def CreateBindingJSObject(descriptor, parent=None): """ return create -class CGWrapWithCacheMethod(CGAbstractMethod): +class CGWrapMethod(CGAbstractMethod): def __init__(self, descriptor): assert descriptor.interface.hasInterfacePrototypeObject() args = [Argument('*JSContext', 'aCx'), Argument('*JSObject', 'aScope'), Argument(DOMObjectPointerArg(descriptor), 'aObject', mutable=True)] - CGAbstractMethod.__init__(self, descriptor, 'Wrap_', '*JSObject', args) + CGAbstractMethod.__init__(self, descriptor, 'Wrap', '*JSObject', args, pub=True) def definition_body(self): if not self.descriptor.createGlobal: @@ -2630,17 +2630,6 @@ class CGWrapWithCacheMethod(CGAbstractMethod): (*raw).mut_reflector().set_jsobject(obj); return obj;""" % CreateBindingJSObject(self.descriptor) -class CGWrapMethod(CGAbstractMethod): - def __init__(self, descriptor): - # XXX can we wrap if we don't have an interface prototype object? - assert descriptor.interface.hasInterfacePrototypeObject() - args = [Argument('*JSContext', 'aCx'), Argument('*JSObject', 'aScope'), - Argument(DOMObjectPointerArg(descriptor), 'aObject', mutable=True)] - CGAbstractMethod.__init__(self, descriptor, 'Wrap', '*JSObject', args, inline=True, pub=True) - - def definition_body(self): - return "return Wrap_(aCx, aScope, aObject);" - class CGAbstractExternMethod(CGAbstractMethod): """ Abstract base class for codegen of implementation-only (no @@ -4937,7 +4926,6 @@ class CGDescriptor(CGThing): cgThings.append(CGDOMJSClass(descriptor)) pass - cgThings.append(CGWrapWithCacheMethod(descriptor)) cgThings.append(CGWrapMethod(descriptor)) cgThings = CGList((CGIndenter(t, declareOnly=True) for t in cgThings), "\n")