diff options
author | Fernando Jiménez Moreno <ferjmoreno@gmail.com> | 2017-03-29 20:34:37 +0200 |
---|---|---|
committer | Fernando Jiménez Moreno <ferjmoreno@gmail.com> | 2017-03-30 14:27:40 +0200 |
commit | fb878f33d1a15425c59f94ce5202010c5400f9ed (patch) | |
tree | fc9c1ac473a2059789fc2158bc972afa14fe6daa /components/script/dom/globalscope.rs | |
parent | 6a795f4795f936789a3f34ad87a367e52cf1bf97 (diff) | |
download | servo-fb878f33d1a15425c59f94ce5202010c5400f9ed.tar.gz servo-fb878f33d1a15425c59f94ce5202010c5400f9ed.zip |
Terminate timer scheduler thread during shutdown
Diffstat (limited to 'components/script/dom/globalscope.rs')
-rw-r--r-- | components/script/dom/globalscope.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/globalscope.rs b/components/script/dom/globalscope.rs index 2b4d3fc6886..73ba61e4557 100644 --- a/components/script/dom/globalscope.rs +++ b/components/script/dom/globalscope.rs @@ -37,7 +37,7 @@ 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::{TimerEventId, TimerEventRequest, TimerSource}; +use script_traits::{TimerEventId, TimerSchedulerMsg, TimerSource}; use servo_url::ServoUrl; use std::cell::Cell; use std::collections::HashMap; @@ -82,7 +82,7 @@ pub struct GlobalScope { constellation_chan: IpcSender<ConstellationMsg>, #[ignore_heap_size_of = "channels are hard"] - scheduler_chan: IpcSender<TimerEventRequest>, + scheduler_chan: IpcSender<TimerSchedulerMsg>, /// https://html.spec.whatwg.org/multipage/#in-error-reporting-mode in_error_reporting_mode: Cell<bool>, @@ -101,7 +101,7 @@ impl GlobalScope { mem_profiler_chan: mem::ProfilerChan, time_profiler_chan: time::ProfilerChan, constellation_chan: IpcSender<ConstellationMsg>, - scheduler_chan: IpcSender<TimerEventRequest>, + scheduler_chan: IpcSender<TimerSchedulerMsg>, resource_threads: ResourceThreads, timer_event_chan: IpcSender<TimerEvent>) -> Self { @@ -229,7 +229,7 @@ impl GlobalScope { &self.constellation_chan } - pub fn scheduler_chan(&self) -> &IpcSender<TimerEventRequest> { + pub fn scheduler_chan(&self) -> &IpcSender<TimerSchedulerMsg> { &self.scheduler_chan } |