diff options
| -rw-r--r-- | components/script/dom/bindings/error.rs | 6 | ||||
| -rw-r--r-- | components/script/dom/promise.rs | 2 |
2 files changed, 4 insertions, 4 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); diff --git a/components/script/dom/promise.rs b/components/script/dom/promise.rs index 867be7809d3..fe63cff9b94 100644 --- a/components/script/dom/promise.rs +++ b/components/script/dom/promise.rs @@ -167,7 +167,7 @@ impl Promise { pub fn reject_error(&self, cx: *mut JSContext, error: Error) { rooted!(in(cx) let mut v = UndefinedValue()); unsafe { - error.to_jsval(cx, self.global().r(), v.handle_mut()); + error.to_jsval(cx, &self.global_scope(), v.handle_mut()); } self.reject(cx, v.handle()); } |