diff options
author | Alan Jeffrey <ajeffrey@mozilla.com> | 2018-06-01 17:24:25 -0500 |
---|---|---|
committer | Josh Matthews <josh@joshmatthews.net> | 2018-08-20 18:22:29 -0400 |
commit | 74c1e00d8163f255bb4141ff3549bbdedd7ea766 (patch) | |
tree | d3960a6cff086d3ca2240fcc6eaa863dba4910c2 /components/script/dom/promise.rs | |
parent | d34403047e806fa6c8c2468946f64429622ec434 (diff) | |
download | servo-74c1e00d8163f255bb4141ff3549bbdedd7ea766.tar.gz servo-74c1e00d8163f255bb4141ff3549bbdedd7ea766.zip |
Upgraded to SM 60
Diffstat (limited to 'components/script/dom/promise.rs')
-rw-r--r-- | components/script/dom/promise.rs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/components/script/dom/promise.rs b/components/script/dom/promise.rs index 1a4300a2b45..0ee8e325154 100644 --- a/components/script/dom/promise.rs +++ b/components/script/dom/promise.rs @@ -21,12 +21,11 @@ use dom_struct::dom_struct; use js::conversions::ToJSValConvertible; use js::jsapi::{AddRawValueRoot, CallArgs, GetFunctionNativeReserved}; use js::jsapi::{Heap, JS_ClearPendingException}; -use js::jsapi::{JSAutoCompartment, JSContext, JSObject, JS_GetContext, JS_GetFunctionObject}; -use js::jsapi::{JS_GetObjectRuntime, JS_NewFunction}; -use js::jsapi::{NewFunctionWithReserved, PromiseState}; +use js::jsapi::{JSAutoCompartment, JSContext, JSObject, JS_GetFunctionObject}; +use js::jsapi::{JS_NewFunction, NewFunctionWithReserved, PromiseState}; use js::jsapi::{RemoveRawValueRoot, SetFunctionNativeReserved}; use js::jsval::{JSVal, UndefinedValue, ObjectValue, Int32Value}; -use js::rust::{HandleObject, HandleValue, MutableHandleObject}; +use js::rust::{HandleObject, HandleValue, MutableHandleObject, Runtime}; use js::rust::wrappers::{AddPromiseReactions, CallOriginalPromiseResolve, CallOriginalPromiseReject}; use js::rust::wrappers::{GetPromiseState, IsPromiseObject}; use js::rust::wrappers::{NewPromiseObject, ResolvePromise, RejectPromise}; @@ -67,9 +66,7 @@ impl Drop for Promise { unsafe { let object = self.permanent_js_root.get().to_object(); assert!(!object.is_null()); - let runtime = JS_GetObjectRuntime(object); - assert!(!runtime.is_null()); - let cx = JS_GetContext(runtime); + let cx = Runtime::get(); assert!(!cx.is_null()); RemoveRawValueRoot(cx, self.permanent_js_root.get_unsafe()); } |