diff options
| author | Rohan Prinja <rohan@cs.unc.edu> | 2016-11-10 02:24:01 -0500 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2016-11-30 23:23:41 +0100 |
| commit | 973f77c00698938c1333c0df7da30993075264d1 (patch) | |
| tree | 1f7533d43218cb3916acb812b7f5139848ed64d9 /components/script/dom/bindings/codegen | |
| parent | 8af2327e95fe2f229df27074b868aad56bce2252 (diff) | |
| download | servo-973f77c00698938c1333c0df7da30993075264d1.tar.gz servo-973f77c00698938c1333c0df7da30993075264d1.zip | |
Make WebIDL constructors take a more specific global if possible (fixes #14071)
Diffstat (limited to 'components/script/dom/bindings/codegen')
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 0003496e33e..09681e579b9 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -3168,7 +3168,7 @@ class CGCallGenerator(CGThing): if isFallible: if static: - glob = "&global" + glob = "global.upcast::<GlobalScope>()" else: glob = "&this.global()" @@ -5245,12 +5245,14 @@ class CGClassConstructHook(CGAbstractExternMethod): assert constructor CGAbstractExternMethod.__init__(self, descriptor, name, 'bool', args) self.constructor = constructor + self.exposureSet = descriptor.interface.exposureSet def definition_body(self): - preamble = CGGeneric("""\ -let global = GlobalScope::from_object(JS_CALLEE(cx, vp).to_object()); -let args = CallArgs::from_vp(vp, argc); -""") + preamble = """let global = GlobalScope::from_object(JS_CALLEE(cx, vp).to_object());\n""" + if len(self.exposureSet) == 1: + preamble += "let global = Root::downcast::<dom::types::%s>(global).unwrap();\n" % list(self.exposureSet)[0] + preamble += """let args = CallArgs::from_vp(vp, argc);\n""" + preamble = CGGeneric(preamble) name = self.constructor.identifier.name nativeName = MakeNativeName(self.descriptor.binaryNameFor(name)) callGenerator = CGMethodCall(["&global"], nativeName, True, @@ -5582,6 +5584,7 @@ def generate_imports(config, cgthings, descriptors, callbacks=None, dictionaries 'dom::bindings::error::throw_dom_exception', 'dom::bindings::guard::Condition', 'dom::bindings::guard::Guard', + 'dom::bindings::inheritance::Castable', 'dom::bindings::proxyhandler', 'dom::bindings::proxyhandler::ensure_expando_object', 'dom::bindings::proxyhandler::fill_property_descriptor', |