diff options
| author | marmeladema <xademax@gmail.com> | 2019-07-22 22:14:11 +0100 |
|---|---|---|
| committer | marmeladema <xademax@gmail.com> | 2019-07-24 09:53:10 +0100 |
| commit | 88cacfb0098e20be70c27bfde6b74cd3290f1fe4 (patch) | |
| tree | 95d7cd9ffad7eaff05114946a1e12f8e49d55fab /components/script/script_runtime.rs | |
| parent | 2c5d0a6ebc39ad263e2bbe623e357a11b4cec5aa (diff) | |
| download | servo-88cacfb0098e20be70c27bfde6b74cd3290f1fe4.tar.gz servo-88cacfb0098e20be70c27bfde6b74cd3290f1fe4.zip | |
Modify *::get_cx methods to return a safe JSContext instead of a raw one
Diffstat (limited to 'components/script/script_runtime.rs')
| -rw-r--r-- | components/script/script_runtime.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/components/script/script_runtime.rs b/components/script/script_runtime.rs index 4c7953de443..fb94d30fafd 100644 --- a/components/script/script_runtime.rs +++ b/components/script/script_runtime.rs @@ -245,7 +245,7 @@ unsafe extern "C" fn promise_rejection_tracker( let cx = target.global().get_cx(); let root_promise = trusted_promise.root(); - rooted!(in(cx) let reason = GetPromiseResult(root_promise.reflector().get_jsobject())); + rooted!(in(*cx) let reason = GetPromiseResult(root_promise.reflector().get_jsobject())); let event = PromiseRejectionEvent::new( &target.global(), @@ -270,9 +270,8 @@ unsafe extern "C" fn promise_rejection_tracker( #[allow(unsafe_code, unrooted_must_root)] /// https://html.spec.whatwg.org/multipage/#notify-about-rejected-promises pub fn notify_about_rejected_promises(global: &GlobalScope) { + let cx = global.get_cx(); unsafe { - let cx = global.get_cx(); - // Step 2. if global.get_uncaught_rejections().borrow().len() > 0 { // Step 1. @@ -282,7 +281,7 @@ pub fn notify_about_rejected_promises(global: &GlobalScope) { .iter() .map(|promise| { let promise = - Promise::new_with_js_promise(Handle::from_raw(promise.handle()), cx); + Promise::new_with_js_promise(Handle::from_raw(promise.handle()), *cx); TrustedPromise::new(promise) }) @@ -309,7 +308,7 @@ pub fn notify_about_rejected_promises(global: &GlobalScope) { } // Step 4-2. - rooted!(in(cx) let reason = GetPromiseResult(promise.reflector().get_jsobject())); + rooted!(in(*cx) let reason = GetPromiseResult(promise.reflector().get_jsobject())); let event = PromiseRejectionEvent::new( &target.global(), |