diff options
| author | Ms2ger <ms2ger@gmail.com> | 2014-07-15 22:28:43 +0200 |
|---|---|---|
| committer | Ms2ger <ms2ger@gmail.com> | 2014-07-15 22:28:43 +0200 |
| commit | d97ec6995773ee79fbde053520bc580e7b33d15d (patch) | |
| tree | e5a00cefa1309b80bc8a44287c3cc9059ed4a257 /src/components/script/dom/bindings/codegen | |
| parent | f816a92c72e2eb60f733b2cd7072c8542710d5ae (diff) | |
| parent | df9d063b36aca184a336b9e67da3ce30bb46cb79 (diff) | |
| download | servo-d97ec6995773ee79fbde053520bc580e7b33d15d.tar.gz servo-d97ec6995773ee79fbde053520bc580e7b33d15d.zip | |
Merge pull request #2839 from Ms2ger/globals
Introduce abstractions for global scopes; r=Manishearth,larsberg
Diffstat (limited to 'src/components/script/dom/bindings/codegen')
| -rw-r--r-- | src/components/script/dom/bindings/codegen/CodegenRust.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 43c5ac3f169..525c77b6419 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -1792,7 +1792,7 @@ class CGWrapMethod(CGAbstractMethod): def __init__(self, descriptor): assert descriptor.interface.hasInterfacePrototypeObject() if not descriptor.createGlobal: - args = [Argument('*mut JSContext', 'aCx'), Argument('&JSRef<Window>', 'aScope'), + args = [Argument('*mut JSContext', 'aCx'), Argument('&GlobalRef', 'aScope'), Argument("Box<%s>" % descriptor.concreteType, 'aObject', mutable=True)] else: args = [Argument('*mut JSContext', 'aCx'), @@ -2185,7 +2185,7 @@ class CGCallGenerator(CGThing): " Ok(result) => result,\n" " Err(e) => {\n" "%s" - " throw_dom_exception(cx, &*global, e);\n" + " throw_dom_exception(cx, &global.root_ref(), e);\n" " return%s;\n" " },\n" "};\n" % (glob, errorResult))) @@ -4405,6 +4405,7 @@ class CGBindingRoot(CGThing): 'js::rust::with_compartment', 'dom::types::*', 'dom::bindings', + 'dom::bindings::global::GlobalRef', 'dom::bindings::js::{JS, JSRef, Root, RootedReference, Temporary}', 'dom::bindings::js::{OptionalRootable, OptionalRootedRootable, ResultRootable}', 'dom::bindings::js::{OptionalRootedReference, OptionalOptionalRootedRootable}', |