mirror of
https://github.com/servo/servo.git
synced 2025-07-24 15:50:21 +01:00
Do not use GlobalRoot in CodegenRust anymore
This commit is contained in:
parent
02d38e74e9
commit
144dc62575
1 changed files with 8 additions and 8 deletions
|
@ -3168,7 +3168,7 @@ class CGCallGenerator(CGThing):
|
||||||
|
|
||||||
if isFallible:
|
if isFallible:
|
||||||
if static:
|
if static:
|
||||||
glob = "global.r().as_global_scope()"
|
glob = "&global"
|
||||||
else:
|
else:
|
||||||
glob = "&global_scope_from_reflector(this)"
|
glob = "&global_scope_from_reflector(this)"
|
||||||
|
|
||||||
|
@ -3386,7 +3386,7 @@ class CGAbstractStaticBindingMethod(CGAbstractMethod):
|
||||||
|
|
||||||
def definition_body(self):
|
def definition_body(self):
|
||||||
preamble = CGGeneric("""\
|
preamble = CGGeneric("""\
|
||||||
let global = global_root_from_object(JS_CALLEE(cx, vp).to_object());
|
let global = global_scope_from_object(JS_CALLEE(cx, vp).to_object());
|
||||||
""")
|
""")
|
||||||
return CGList([preamble, self.generate_code()])
|
return CGList([preamble, self.generate_code()])
|
||||||
|
|
||||||
|
@ -3438,7 +3438,7 @@ class CGStaticMethod(CGAbstractStaticBindingMethod):
|
||||||
nativeName = CGSpecializedMethod.makeNativeName(self.descriptor,
|
nativeName = CGSpecializedMethod.makeNativeName(self.descriptor,
|
||||||
self.method)
|
self.method)
|
||||||
setupArgs = CGGeneric("let args = CallArgs::from_vp(vp, argc);\n")
|
setupArgs = CGGeneric("let args = CallArgs::from_vp(vp, argc);\n")
|
||||||
call = CGMethodCall(["global.r().as_global_scope()"], nativeName, True, self.descriptor, self.method)
|
call = CGMethodCall(["&global"], nativeName, True, self.descriptor, self.method)
|
||||||
return CGList([setupArgs, call])
|
return CGList([setupArgs, call])
|
||||||
|
|
||||||
|
|
||||||
|
@ -3492,7 +3492,7 @@ class CGStaticGetter(CGAbstractStaticBindingMethod):
|
||||||
nativeName = CGSpecializedGetter.makeNativeName(self.descriptor,
|
nativeName = CGSpecializedGetter.makeNativeName(self.descriptor,
|
||||||
self.attr)
|
self.attr)
|
||||||
setupArgs = CGGeneric("let args = CallArgs::from_vp(vp, argc);\n")
|
setupArgs = CGGeneric("let args = CallArgs::from_vp(vp, argc);\n")
|
||||||
call = CGGetterCall(["global.r().as_global_scope()"], self.attr.type, nativeName, self.descriptor,
|
call = CGGetterCall(["&global"], self.attr.type, nativeName, self.descriptor,
|
||||||
self.attr)
|
self.attr)
|
||||||
return CGList([setupArgs, call])
|
return CGList([setupArgs, call])
|
||||||
|
|
||||||
|
@ -3545,7 +3545,7 @@ class CGStaticSetter(CGAbstractStaticBindingMethod):
|
||||||
" throw_type_error(cx, \"Not enough arguments to %s setter.\");\n"
|
" throw_type_error(cx, \"Not enough arguments to %s setter.\");\n"
|
||||||
" return false;\n"
|
" return false;\n"
|
||||||
"}" % self.attr.identifier.name)
|
"}" % self.attr.identifier.name)
|
||||||
call = CGSetterCall(["global.r().as_global_scope()"], self.attr.type, nativeName, self.descriptor,
|
call = CGSetterCall(["&global"], self.attr.type, nativeName, self.descriptor,
|
||||||
self.attr)
|
self.attr)
|
||||||
return CGList([checkForArg, call])
|
return CGList([checkForArg, call])
|
||||||
|
|
||||||
|
@ -5252,12 +5252,12 @@ class CGClassConstructHook(CGAbstractExternMethod):
|
||||||
|
|
||||||
def definition_body(self):
|
def definition_body(self):
|
||||||
preamble = CGGeneric("""\
|
preamble = CGGeneric("""\
|
||||||
let global = global_root_from_object(JS_CALLEE(cx, vp).to_object());
|
let global = global_scope_from_object(JS_CALLEE(cx, vp).to_object());
|
||||||
let args = CallArgs::from_vp(vp, argc);
|
let args = CallArgs::from_vp(vp, argc);
|
||||||
""")
|
""")
|
||||||
name = self.constructor.identifier.name
|
name = self.constructor.identifier.name
|
||||||
nativeName = MakeNativeName(self.descriptor.binaryNameFor(name))
|
nativeName = MakeNativeName(self.descriptor.binaryNameFor(name))
|
||||||
callGenerator = CGMethodCall(["global.r().as_global_scope()"], nativeName, True,
|
callGenerator = CGMethodCall(["&global"], nativeName, True,
|
||||||
self.descriptor, self.constructor)
|
self.descriptor, self.constructor)
|
||||||
return CGList([preamble, callGenerator])
|
return CGList([preamble, callGenerator])
|
||||||
|
|
||||||
|
@ -5500,9 +5500,9 @@ def generate_imports(config, cgthings, descriptors, callbacks=None, dictionaries
|
||||||
'dom::bindings::constant::ConstantSpec',
|
'dom::bindings::constant::ConstantSpec',
|
||||||
'dom::bindings::constant::ConstantVal',
|
'dom::bindings::constant::ConstantVal',
|
||||||
'dom::bindings::global::GlobalRef',
|
'dom::bindings::global::GlobalRef',
|
||||||
'dom::bindings::global::global_root_from_object',
|
|
||||||
'dom::bindings::global::global_scope_from_object_maybe_wrapped',
|
'dom::bindings::global::global_scope_from_object_maybe_wrapped',
|
||||||
'dom::bindings::global::global_scope_from_reflector',
|
'dom::bindings::global::global_scope_from_reflector',
|
||||||
|
'dom::bindings::global::global_scope_from_object',
|
||||||
'dom::bindings::interface::ConstructorClassHook',
|
'dom::bindings::interface::ConstructorClassHook',
|
||||||
'dom::bindings::interface::InterfaceConstructorBehavior',
|
'dom::bindings::interface::InterfaceConstructorBehavior',
|
||||||
'dom::bindings::interface::NonCallbackInterfaceObjectClass',
|
'dom::bindings::interface::NonCallbackInterfaceObjectClass',
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue