diff options
| author | Ms2ger <Ms2ger@gmail.com> | 2015-08-12 15:18:17 +0200 |
|---|---|---|
| committer | Ms2ger <Ms2ger@gmail.com> | 2015-08-12 15:25:31 +0200 |
| commit | c05f0906d55831a97571d9eec13735ebfa975c49 (patch) | |
| tree | 82b23252911e061dadf0364acb3d24dbb983e884 /components/script/script_task.rs | |
| parent | 3b1b3fe0a09e3b0ba6033e758b3fad49b5269f20 (diff) | |
| download | servo-c05f0906d55831a97571d9eec13735ebfa975c49.tar.gz servo-c05f0906d55831a97571d9eec13735ebfa975c49.zip | |
Store a Sender<ConstellationControlMsg> in ScriptTask.
Diffstat (limited to 'components/script/script_task.rs')
| -rw-r--r-- | components/script/script_task.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs index efbad39dc86..43c047c3231 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -311,7 +311,7 @@ pub struct ScriptTask { chan: NonWorkerScriptChan, /// 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 /// script task. @@ -405,7 +405,7 @@ impl ScriptTaskFactory for ScriptTask { parent_info: Option<(PipelineId, SubpageId)>, compositor: ScriptListener, layout_chan: &OpaqueScriptLayoutChannel, - control_chan: ScriptControlChan, + control_chan: Sender<ConstellationControlMsg>, control_port: Receiver<ConstellationControlMsg>, constellation_chan: ConstellationChan, failure_msg: Failure, @@ -542,7 +542,7 @@ impl ScriptTask { pub fn new(compositor: ScriptListener, port: Receiver<ScriptMsg>, chan: NonWorkerScriptChan, - control_chan: ScriptControlChan, + control_chan: Sender<ConstellationControlMsg>, control_port: Receiver<ConstellationControlMsg>, constellation_chan: ConstellationChan, resource_task: Arc<ResourceTask>, @@ -1053,7 +1053,7 @@ impl ScriptTask { constellation_chan: self.constellation_chan.clone(), failure: failure, 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(), layout_shutdown_chan: layout_shutdown_chan, }; @@ -1466,7 +1466,7 @@ impl ScriptTask { page.clone(), self.chan.clone(), self.image_cache_channel.clone(), - self.control_chan.clone(), + ScriptControlChan(self.control_chan.clone()), self.compositor.borrow_mut().dup(), self.image_cache_task.clone(), self.resource_task.clone(), |