diff options
Diffstat (limited to 'components/script/dom/serviceworkerglobalscope.rs')
| -rw-r--r-- | components/script/dom/serviceworkerglobalscope.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/components/script/dom/serviceworkerglobalscope.rs b/components/script/dom/serviceworkerglobalscope.rs index dce908c406a..5af7f07ab0f 100644 --- a/components/script/dom/serviceworkerglobalscope.rs +++ b/components/script/dom/serviceworkerglobalscope.rs @@ -21,7 +21,9 @@ use crate::dom::globalscope::GlobalScope; use crate::dom::worker::TrustedWorkerAddress; use crate::dom::workerglobalscope::WorkerGlobalScope; use crate::fetch::load_whole_resource; -use crate::script_runtime::{new_rt_and_cx, CommonScriptMsg, Runtime, ScriptChan}; +use crate::script_runtime::{ + new_rt_and_cx, CommonScriptMsg, JSContext as SafeJSContext, Runtime, ScriptChan, +}; use crate::task_queue::{QueuedTask, QueuedTaskConversion, TaskQueue}; use crate::task_source::TaskSourceName; use crossbeam_channel::{unbounded, Receiver, Sender}; @@ -246,7 +248,7 @@ impl ServiceWorkerGlobalScope { swmanager_sender, scope_url, )); - unsafe { ServiceWorkerGlobalScopeBinding::Wrap(cx, scope) } + unsafe { ServiceWorkerGlobalScopeBinding::Wrap(SafeJSContext::from_ptr(cx), scope) } } #[allow(unsafe_code)] @@ -335,7 +337,7 @@ impl ServiceWorkerGlobalScope { unsafe { // Handle interrupt requests - JS_AddInterruptCallback(scope.get_cx(), Some(interrupt_callback)); + JS_AddInterruptCallback(*scope.get_cx(), Some(interrupt_callback)); } scope.execute_script(DOMString::from(source)); @@ -411,7 +413,7 @@ impl ServiceWorkerGlobalScope { let scope = self.upcast::<WorkerGlobalScope>(); let target = self.upcast(); let _ac = enter_realm(&*scope); - rooted!(in(scope.get_cx()) let mut message = UndefinedValue()); + rooted!(in(*scope.get_cx()) let mut message = UndefinedValue()); data.read(scope.upcast(), message.handle_mut()); ExtendableMessageEvent::dispatch_jsval(target, scope.upcast(), message.handle()); }, |