diff options
Diffstat (limited to 'components/script/dom/worker.rs')
-rw-r--r-- | components/script/dom/worker.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index d6e4391cbfd..51f9962ed6b 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -71,31 +71,31 @@ impl Worker { let (sender, receiver) = channel(); let worker = Worker::new(global, sender.clone()).root(); - let worker_ref = Trusted::new(global.get_cx(), *worker, global.script_chan()); + let worker_ref = Trusted::new(global.get_cx(), worker.r(), global.script_chan()); DedicatedWorkerGlobalScope::run_worker_scope( worker_url, worker_ref, resource_task, global.script_chan(), sender, receiver); - Ok(Temporary::from_rooted(*worker)) + Ok(Temporary::from_rooted(worker.r())) } pub fn handle_message(address: TrustedWorkerAddress, data: *mut u64, nbytes: size_t) { let worker = address.to_temporary().root(); - let global = worker.global.root(); + let global = worker.r().global.root(); let mut message = UndefinedValue(); unsafe { assert!(JS_ReadStructuredClone( - global.root_ref().get_cx(), data as *const u64, nbytes, + global.r().get_cx(), data as *const u64, nbytes, JS_STRUCTURED_CLONE_VERSION, &mut message, ptr::null(), ptr::null_mut()) != 0); } - let target: JSRef<EventTarget> = EventTargetCast::from_ref(*worker); - MessageEvent::dispatch_jsval(target, global.root_ref(), message); + let target: JSRef<EventTarget> = EventTargetCast::from_ref(worker.r()); + MessageEvent::dispatch_jsval(target, global.r(), message); } } @@ -112,7 +112,7 @@ impl<'a> WorkerMethods for JSRef<'a, Worker> { return Err(DataClone); } - let address = Trusted::new(cx, self, self.global.root().root_ref().script_chan().clone()); + let address = Trusted::new(cx, self, self.global.root().r().script_chan().clone()); self.sender.send((address, ScriptMsg::DOMMessage(data, nbytes))); Ok(()) } |