From 582ba9d796f39b8474c6700572bbc40860ac8b6b Mon Sep 17 00:00:00 2001
From: Amanda Watson <amwatson@andrew.cmu.edu>
Date: Sat, 20 Dec 2014 16:20:53 -0800
Subject: [PATCH] GlobalRef passed by value in reflect_dom_object, reflect_node
 #4165

---
 components/script/dom/bindings/codegen/CodegenRust.py | 2 +-
 components/script/dom/bindings/utils.rs               | 4 ++--
 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 a7d068a86a4..2241f49aad5 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)