Store a Sender<ConstellationControlMsg> in PipelineContent.

This commit is contained in:
Ms2ger 2015-08-12 15:58:10 +02:00
parent fdafc5c360
commit 9476474267

View file

@ -165,7 +165,7 @@ impl Pipeline {
time_profiler_chan: time_profiler_chan,
mem_profiler_chan: mem_profiler_chan,
window_size: window_size,
script_chan: script_chan,
script_chan: script_chan.0,
load_data: load_data,
failure: failure,
script_port: script_port,
@ -298,7 +298,7 @@ pub struct PipelineContent {
time_profiler_chan: time::ProfilerChan,
mem_profiler_chan: profile_mem::ProfilerChan,
window_size: Option<WindowSizeData>,
script_chan: ScriptControlChan,
script_chan: Sender<ConstellationControlMsg>,
load_data: LoadData,
failure: Failure,
script_port: Option<Receiver<ConstellationControlMsg>>,
@ -331,7 +331,7 @@ impl PipelineContent {
self.parent_info,
ScriptListener::new(script_to_compositor_chan),
&layout_pair,
self.script_chan.0.clone(),
self.script_chan.clone(),
mem::replace(&mut self.script_port, None).unwrap(),
self.constellation_chan.clone(),
self.failure.clone(),
@ -351,7 +351,7 @@ impl PipelineContent {
self.pipeline_port.unwrap(),
self.constellation_chan,
self.failure,
self.script_chan.0.clone(),
self.script_chan.clone(),
self.layout_to_paint_chan.clone(),
self.image_cache_task,
self.font_cache_task,