aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_thread.rs
diff options
context:
space:
mode:
authorFernando Jiménez Moreno <ferjmoreno@gmail.com>2017-03-29 20:34:37 +0200
committerFernando Jiménez Moreno <ferjmoreno@gmail.com>2017-03-30 14:27:40 +0200
commitfb878f33d1a15425c59f94ce5202010c5400f9ed (patch)
treefc9c1ac473a2059789fc2158bc972afa14fe6daa /components/script/script_thread.rs
parent6a795f4795f936789a3f34ad87a367e52cf1bf97 (diff)
downloadservo-fb878f33d1a15425c59f94ce5202010c5400f9ed.tar.gz
servo-fb878f33d1a15425c59f94ce5202010c5400f9ed.zip
Terminate timer scheduler thread during shutdown
Diffstat (limited to 'components/script/script_thread.rs')
-rw-r--r--components/script/script_thread.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 4399fb32630..87cf0920b5e 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -86,7 +86,7 @@ use script_traits::{CompositorEvent, ConstellationControlMsg};
use script_traits::{DocumentActivity, DiscardBrowsingContext, EventResult};
use script_traits::{InitialScriptState, LayoutMsg, LoadData, MouseButton, MouseEventType, MozBrowserEvent};
use script_traits::{NewLayoutInfo, ScriptMsg as ConstellationMsg};
-use script_traits::{ScriptThreadFactory, TimerEvent, TimerEventRequest, TimerSource};
+use script_traits::{ScriptThreadFactory, TimerEvent, TimerSchedulerMsg, TimerSource};
use script_traits::{TouchEventType, TouchId, UntrustedNodeAddress, WindowSizeData, WindowSizeType};
use script_traits::CompositorEvent::{KeyEvent, MouseButtonEvent, MouseMoveEvent, ResizeEvent};
use script_traits::CompositorEvent::{TouchEvent, TouchpadPressureEvent};
@@ -472,7 +472,7 @@ pub struct ScriptThread {
/// List of pipelines that have been owned and closed by this script thread.
closed_pipelines: DOMRefCell<HashSet<PipelineId>>,
- scheduler_chan: IpcSender<TimerEventRequest>,
+ scheduler_chan: IpcSender<TimerSchedulerMsg>,
timer_event_chan: Sender<TimerEvent>,
timer_event_port: Receiver<TimerEvent>,