diff options
author | Paul Rouget <me@paulrouget.com> | 2017-07-18 08:19:44 +0200 |
---|---|---|
committer | Paul Rouget <me@paulrouget.com> | 2017-08-15 08:22:09 +0200 |
commit | d2413891292bfb4d5f17d7eb1e3882e07f6ac626 (patch) | |
tree | 17d2768aaa861740b6bcf638d2a3219086828a74 /components/script/dom/globalscope.rs | |
parent | 817de1573556b49038d8b704398bb32e78296a43 (diff) | |
download | servo-d2413891292bfb4d5f17d7eb1e3882e07f6ac626.tar.gz servo-d2413891292bfb4d5f17d7eb1e3882e07f6ac626.zip |
make use of ScriptToConstellationChan
Diffstat (limited to 'components/script/dom/globalscope.rs')
-rw-r--r-- | components/script/dom/globalscope.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/globalscope.rs b/components/script/dom/globalscope.rs index 3a47298c53b..b90e4204c2e 100644 --- a/components/script/dom/globalscope.rs +++ b/components/script/dom/globalscope.rs @@ -37,7 +37,7 @@ use net_traits::{CoreResourceThread, ResourceThreads, IpcSend}; use profile_traits::{mem, time}; use script_runtime::{CommonScriptMsg, ScriptChan, ScriptPort}; use script_thread::{MainThreadScriptChan, RunnableWrapper, ScriptThread}; -use script_traits::{MsDuration, ScriptMsg as ConstellationMsg, TimerEvent}; +use script_traits::{MsDuration, ScriptToConstellationChan, TimerEvent}; use script_traits::{TimerEventId, TimerSchedulerMsg, TimerSource}; use servo_url::{MutableOrigin, ServoUrl}; use std::cell::Cell; @@ -80,7 +80,7 @@ pub struct GlobalScope { /// A handle for communicating messages to the constellation thread. #[ignore_heap_size_of = "channels are hard"] - constellation_chan: IpcSender<ConstellationMsg>, + script_to_constellation_chan: ScriptToConstellationChan, #[ignore_heap_size_of = "channels are hard"] scheduler_chan: IpcSender<TimerSchedulerMsg>, @@ -104,7 +104,7 @@ impl GlobalScope { devtools_chan: Option<IpcSender<ScriptToDevtoolsControlMsg>>, mem_profiler_chan: mem::ProfilerChan, time_profiler_chan: time::ProfilerChan, - constellation_chan: IpcSender<ConstellationMsg>, + script_to_constellation_chan: ScriptToConstellationChan, scheduler_chan: IpcSender<TimerSchedulerMsg>, resource_threads: ResourceThreads, timer_event_chan: IpcSender<TimerEvent>, @@ -120,7 +120,7 @@ impl GlobalScope { devtools_chan: devtools_chan, mem_profiler_chan: mem_profiler_chan, time_profiler_chan: time_profiler_chan, - constellation_chan: constellation_chan, + script_to_constellation_chan: script_to_constellation_chan, scheduler_chan: scheduler_chan.clone(), in_error_reporting_mode: Default::default(), resource_threads: resource_threads, @@ -231,8 +231,8 @@ impl GlobalScope { } /// Get a sender to the constellation thread. - pub fn constellation_chan(&self) -> &IpcSender<ConstellationMsg> { - &self.constellation_chan + pub fn script_to_constellation_chan(&self) -> &ScriptToConstellationChan { + &self.script_to_constellation_chan } pub fn scheduler_chan(&self) -> &IpcSender<TimerSchedulerMsg> { |