This fixes #4166. throw_dom_exception will take the GlobalRef by valu…

…e, and all generated code will pass it by value.
servo · Dec 24, 2014 · bdb75c2 · bdb75c2 · bors-servo · Dec 24, 2014
1 parent 070008b
commit bdb75c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -2215,7 +2215,7 @@ def __init__(self, errorResult, arguments, argsPre, returnType,
                 "    Ok(result) => result,\n"
                 "    Err(e) => {\n"
                 "%s"
-                "        throw_dom_exception(cx, &global.root_ref(), e);\n"
+                "        throw_dom_exception(cx, global.root_ref(), e);\n"
                 "        return%s;\n"
                 "    },\n"
                 "};\n" % (glob, errorResult)))

diff --git a/components/script/dom/bindings/error.rs b/components/script/dom/bindings/error.rs
@@ -46,10 +46,10 @@ pub type Fallible<T> = Result<T, Error>;
 pub type ErrorResult = Fallible<()>;
 
 /// Set a pending DOM exception for the given `result` on `cx`.
-pub fn throw_dom_exception(cx: *mut JSContext, global: &GlobalRef,
+pub fn throw_dom_exception(cx: *mut JSContext, global: GlobalRef,
                            result: Error) {
     assert!(unsafe { JS_IsExceptionPending(cx) } == 0);
-    let exception = DOMException::new_from_error(*global, result).root();
+    let exception = DOMException::new_from_error(global, result).root();
     let thrown = exception.to_jsval(cx);
     unsafe {
         JS_SetPendingException(cx, thrown);