Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-29 18:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Store a Sender<ConstellationControlMsg> in ScriptTask.

Browse source
This commit is contained in:
Ms2ger 2015-08-12 15:18:17 +02:00
parent 3b1b3fe0a0
commit c05f0906d5
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/compositing/pipeline.rs
View file

@ -331,7 +331,7 @@ impl PipelineContent {
self.parent_info, self.parent_info,
ScriptListener::new(script_to_compositor_chan), ScriptListener::new(script_to_compositor_chan),
&layout_pair, &layout_pair,
self.script_chan.clone(), self.script_chan.0.clone(),
mem::replace(&mut self.script_port, None).unwrap(), mem::replace(&mut self.script_port, None).unwrap(),
self.constellation_chan.clone(), self.constellation_chan.clone(),
self.failure.clone(), self.failure.clone(),

10
components/script/script_task.rs
View file

@ -311,7 +311,7 @@ pub struct ScriptTask {
chan: NonWorkerScriptChan, chan: NonWorkerScriptChan,
/// A channel to hand out to tasks that need to respond to a message from the script task. /// A channel to hand out to tasks that need to respond to a message from the script task.
control_chan: ScriptControlChan, control_chan: Sender<ConstellationControlMsg>,
/// The port on which the constellation and layout tasks can communicate with the /// The port on which the constellation and layout tasks can communicate with the
/// script task. /// script task.
@ -405,7 +405,7 @@ impl ScriptTaskFactory for ScriptTask {
parent_info: Option<(PipelineId, SubpageId)>, parent_info: Option<(PipelineId, SubpageId)>,
compositor: ScriptListener, compositor: ScriptListener,
layout_chan: &OpaqueScriptLayoutChannel, layout_chan: &OpaqueScriptLayoutChannel,
control_chan: ScriptControlChan, control_chan: Sender<ConstellationControlMsg>,
control_port: Receiver<ConstellationControlMsg>, control_port: Receiver<ConstellationControlMsg>,
constellation_chan: ConstellationChan, constellation_chan: ConstellationChan,
failure_msg: Failure, failure_msg: Failure,
@ -542,7 +542,7 @@ impl ScriptTask {
pub fn new(compositor: ScriptListener, pub fn new(compositor: ScriptListener,
port: Receiver<ScriptMsg>, port: Receiver<ScriptMsg>,
chan: NonWorkerScriptChan, chan: NonWorkerScriptChan,
control_chan: ScriptControlChan, control_chan: Sender<ConstellationControlMsg>,
control_port: Receiver<ConstellationControlMsg>, control_port: Receiver<ConstellationControlMsg>,
constellation_chan: ConstellationChan, constellation_chan: ConstellationChan,
resource_task: Arc<ResourceTask>, resource_task: Arc<ResourceTask>,
@ -1053,7 +1053,7 @@ impl ScriptTask {
constellation_chan: self.constellation_chan.clone(), constellation_chan: self.constellation_chan.clone(),
failure: failure, failure: failure,
paint_chan: paint_chan, paint_chan: paint_chan,
script_chan: self.control_chan.0.clone(), script_chan: self.control_chan.clone(),
image_cache_task: self.image_cache_task.clone(), image_cache_task: self.image_cache_task.clone(),
layout_shutdown_chan: layout_shutdown_chan, layout_shutdown_chan: layout_shutdown_chan,
}; };
@ -1466,7 +1466,7 @@ impl ScriptTask {
page.clone(), page.clone(),
self.chan.clone(), self.chan.clone(),
self.image_cache_channel.clone(), self.image_cache_channel.clone(),
self.control_chan.clone(), ScriptControlChan(self.control_chan.clone()),
self.compositor.borrow_mut().dup(), self.compositor.borrow_mut().dup(),
self.image_cache_task.clone(), self.image_cache_task.clone(),
self.resource_task.clone(), self.resource_task.clone(),

2
components/script_traits/lib.rs
View file

@ -185,7 +185,7 @@ pub trait ScriptTaskFactory {
parent_info: Option<(PipelineId, SubpageId)>, parent_info: Option<(PipelineId, SubpageId)>,
compositor: ScriptListener, compositor: ScriptListener,
layout_chan: &OpaqueScriptLayoutChannel, layout_chan: &OpaqueScriptLayoutChannel,
control_chan: ScriptControlChan, control_chan: Sender<ConstellationControlMsg>,
control_port: Receiver<ConstellationControlMsg>, control_port: Receiver<ConstellationControlMsg>,
constellation_msg: ConstellationChan, constellation_msg: ConstellationChan,
failure_msg: Failure, failure_msg: Failure,