diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-12-20 17:51:44 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-12-20 17:51:44 -0700 |
| commit | a773bd5c4568f2f33855f9cfe04b4301038429f7 (patch) | |
| tree | 03aeb5b0c5245f7458c0f30ca0e7e7a7bffffbd8 /components/script/dom | |
| parent | 6efa7eedbc43c4a1752dccb6a42a080cbe232581 (diff) | |
| parent | 582ba9d796f39b8474c6700572bbc40860ac8b6b (diff) | |
| download | servo-a773bd5c4568f2f33855f9cfe04b4301038429f7.tar.gz servo-a773bd5c4568f2f33855f9cfe04b4301038429f7.zip | |
auto merge of #4454 : amwatson/servo/global_update, r=jdm
Changed fn_wrap argument in reflect_dom_object() and reflect_node() to pass GlobalRef by value rather than by reference. Fixes #4165
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 2 | ||||
| -rw-r--r-- | components/script/dom/bindings/utils.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/node.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index fc7d630a819..03efd2b59f5 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -1830,7 +1830,7 @@ class CGWrapMethod(CGAbstractMethod): def __init__(self, descriptor): assert not descriptor.interface.isCallback() if not descriptor.isGlobal(): - args = [Argument('*mut JSContext', 'aCx'), Argument('&GlobalRef', 'aScope'), + args = [Argument('*mut JSContext', 'aCx'), Argument('GlobalRef', 'aScope'), Argument("Box<%s>" % descriptor.concreteType, 'aObject', mutable=True)] else: args = [Argument('*mut JSContext', 'aCx'), diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index 19e87bf6a5e..3482633ba67 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -340,9 +340,9 @@ pub trait Reflectable { pub fn reflect_dom_object<T: Reflectable> (obj: Box<T>, global: GlobalRef, - wrap_fn: extern "Rust" fn(*mut JSContext, &GlobalRef, Box<T>) -> Temporary<T>) + wrap_fn: extern "Rust" fn(*mut JSContext, GlobalRef, Box<T>) -> Temporary<T>) -> Temporary<T> { - wrap_fn(global.get_cx(), &global, obj) + wrap_fn(global.get_cx(), global, obj) } /// A struct to store a reference to the reflector of a DOM object. diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 1584ff112ac..1187e76a688 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -1157,7 +1157,7 @@ impl Node { pub fn reflect_node<N: Reflectable+NodeBase> (node: Box<N>, document: JSRef<Document>, - wrap_fn: extern "Rust" fn(*mut JSContext, &GlobalRef, Box<N>) -> Temporary<N>) + wrap_fn: extern "Rust" fn(*mut JSContext, GlobalRef, Box<N>) -> Temporary<N>) -> Temporary<N> { let window = document.window().root(); reflect_dom_object(node, GlobalRef::Window(*window), wrap_fn) |