aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings/error.rs
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2016-10-01 21:39:09 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2016-10-06 21:35:42 +0200
commitac5c4c2194495b1949ab4283f0c9c33c8029d5ae (patch)
treee348bf7677e029e2bbef9524fbcf916ebc9272ed /components/script/dom/bindings/error.rs
parente036579ea09b262b2f217f8711f26cc9aecdfef5 (diff)
downloadservo-ac5c4c2194495b1949ab4283f0c9c33c8029d5ae.tar.gz
servo-ac5c4c2194495b1949ab4283f0c9c33c8029d5ae.zip
Make Error::to_jsval take a &GlobalScope
Diffstat (limited to 'components/script/dom/bindings/error.rs')
-rw-r--r--components/script/dom/bindings/error.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/bindings/error.rs b/components/script/dom/bindings/error.rs
index 0b4249e7405..ed274426bd3 100644
--- a/components/script/dom/bindings/error.rs
+++ b/components/script/dom/bindings/error.rs
@@ -8,7 +8,7 @@ use dom::bindings::codegen::Bindings::DOMExceptionBinding::DOMExceptionMethods;
use dom::bindings::codegen::PrototypeList::proto_id_to_name;
use dom::bindings::conversions::{ConversionResult, FromJSValConvertible, ToJSValConvertible};
use dom::bindings::conversions::root_from_object;
-use dom::bindings::global::{GlobalRef, global_root_from_context};
+use dom::bindings::global::global_root_from_context;
use dom::bindings::str::USVString;
use dom::domexception::{DOMErrorName, DOMException};
use dom::globalscope::GlobalScope;
@@ -271,9 +271,9 @@ pub unsafe fn throw_invalid_this(cx: *mut JSContext, proto_id: u16) {
impl Error {
/// Convert this error value to a JS value, consuming it in the process.
- pub unsafe fn to_jsval(self, cx: *mut JSContext, global: GlobalRef, rval: MutableHandleValue) {
+ pub unsafe fn to_jsval(self, cx: *mut JSContext, global: &GlobalScope, rval: MutableHandleValue) {
assert!(!JS_IsExceptionPending(cx));
- throw_dom_exception(cx, global.as_global_scope(), self);
+ throw_dom_exception(cx, global, self);
assert!(JS_IsExceptionPending(cx));
assert!(JS_GetPendingException(cx, rval));
JS_ClearPendingException(cx);