diff options
author | rohan.prinja <rohan.prinja@samsung.com> | 2015-11-14 05:07:55 +0900 |
---|---|---|
committer | Rohan Prinja <rohan.prinja@gmail.com> | 2016-01-10 17:58:13 +0900 |
commit | 1f02c4ebbb7d5ea49051f4391f1418f20c15d7a9 (patch) | |
tree | 7d61e58e746ddca93074ca6bca6849360a098b8c /components/script/dom/worker.rs | |
parent | f00532bab0382d1c24e6086314f26497fb6ffe0f (diff) | |
download | servo-1f02c4ebbb7d5ea49051f4391f1418f20c15d7a9.tar.gz servo-1f02c4ebbb7d5ea49051f4391f1418f20c15d7a9.zip |
task -> thread
Diffstat (limited to 'components/script/dom/worker.rs')
-rw-r--r-- | components/script/dom/worker.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index 5ca3d3316fc..362874643bc 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -24,7 +24,7 @@ use ipc_channel::ipc; use js::jsapi::{HandleValue, JSContext, RootedValue}; use js::jsapi::{JSAutoCompartment, JSAutoRequest}; use js::jsval::UndefinedValue; -use script_task::{Runnable, ScriptChan}; +use script_thread::{Runnable, ScriptChan}; use std::sync::mpsc::{Sender, channel}; use util::str::DOMString; @@ -68,13 +68,13 @@ impl Worker { Err(_) => return Err(Error::Syntax), }; - let resource_task = global.resource_task(); + let resource_thread = global.resource_thread(); let constellation_chan = global.constellation_chan(); let scheduler_chan = global.scheduler_chan(); let (sender, receiver) = channel(); let worker = Worker::new(global, sender.clone()); - let worker_ref = Trusted::new(worker.r(), global.dom_manipulation_task_source()); + let worker_ref = Trusted::new(worker.r(), global.dom_manipulation_thread_source()); let worker_id = global.get_next_worker_id(); let (devtools_sender, devtools_receiver) = ipc::channel().unwrap(); @@ -95,7 +95,7 @@ impl Worker { }; let init = WorkerGlobalScopeInit { - resource_task: resource_task, + resource_thread: resource_thread, mem_profiler_chan: global.mem_profiler_chan(), to_devtools_sender: global.devtools_chan(), from_devtools_sender: optional_sender, @@ -105,7 +105,7 @@ impl Worker { }; DedicatedWorkerGlobalScope::run_worker_scope( init, worker_url, global.pipeline(), devtools_receiver, worker_ref, - global.dom_manipulation_task_source(), sender, receiver); + global.dom_manipulation_thread_source(), sender, receiver); Ok(worker) } @@ -145,7 +145,7 @@ impl WorkerMethods for Worker { // https://html.spec.whatwg.org/multipage/#dom-dedicatedworkerglobalscope-postmessage fn PostMessage(&self, cx: *mut JSContext, message: HandleValue) -> ErrorResult { let data = try!(StructuredCloneData::write(cx, message)); - let address = Trusted::new(self, self.global.root().r().dom_manipulation_task_source()); + let address = Trusted::new(self, self.global.root().r().dom_manipulation_thread_source()); self.sender.send((address, WorkerScriptMsg::DOMMessage(data))).unwrap(); Ok(()) } |