diff options
author | Keith Yeung <kungfukeith11@gmail.com> | 2015-11-14 16:01:34 -0800 |
---|---|---|
committer | Keith Yeung <kungfukeith11@gmail.com> | 2015-11-16 23:10:53 -0800 |
commit | 19294db6e5ffc9e85b4b628ef8dc6c72636c70a7 (patch) | |
tree | 60c26784064e9fecc12f8bd7b44686ceb7b8472a /components/script/dom/workerglobalscope.rs | |
parent | afe03870ce1a5a65b4c22f2e64155259da8b4609 (diff) | |
download | servo-19294db6e5ffc9e85b4b628ef8dc6c72636c70a7.tar.gz servo-19294db6e5ffc9e85b4b628ef8dc6c72636c70a7.zip |
Split ConstellationMsg into ScriptMsg and CompositorMsg
Diffstat (limited to 'components/script/dom/workerglobalscope.rs')
-rw-r--r-- | components/script/dom/workerglobalscope.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs index 3e49836e970..96a1786ff3c 100644 --- a/components/script/dom/workerglobalscope.rs +++ b/components/script/dom/workerglobalscope.rs @@ -20,6 +20,7 @@ use dom::workernavigator::WorkerNavigator; use ipc_channel::ipc::IpcSender; use js::jsapi::{HandleValue, JSAutoRequest, JSContext}; use js::rust::Runtime; +use msg::constellation_msg::ScriptMsg as ConstellationMsg; use msg::constellation_msg::{ConstellationChan, PipelineId, WorkerId}; use net_traits::{ResourceTask, load_whole_resource}; use profile_traits::mem; @@ -43,7 +44,7 @@ pub struct WorkerGlobalScopeInit { pub mem_profiler_chan: mem::ProfilerChan, pub to_devtools_sender: Option<IpcSender<ScriptToDevtoolsControlMsg>>, pub from_devtools_sender: Option<IpcSender<DevtoolScriptControlMsg>>, - pub constellation_chan: ConstellationChan, + pub constellation_chan: ConstellationChan<ConstellationMsg>, pub scheduler_chan: IpcSender<TimerEventRequest>, pub worker_id: WorkerId, } @@ -84,7 +85,7 @@ pub struct WorkerGlobalScope { devtools_wants_updates: Cell<bool>, #[ignore_heap_size_of = "Defined in std"] - constellation_chan: ConstellationChan, + constellation_chan: ConstellationChan<ConstellationMsg>, #[ignore_heap_size_of = "Defined in std"] scheduler_chan: IpcSender<TimerEventRequest>, @@ -135,7 +136,7 @@ impl WorkerGlobalScope { &self.from_devtools_receiver } - pub fn constellation_chan(&self) -> ConstellationChan { + pub fn constellation_chan(&self) -> ConstellationChan<ConstellationMsg> { self.constellation_chan.clone() } |