diff options
| -rw-r--r-- | components/compositing/pipeline.rs | 2 | ||||
| -rw-r--r-- | components/script/script_task.rs | 10 | ||||
| -rw-r--r-- | components/script_traits/lib.rs | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/components/compositing/pipeline.rs b/components/compositing/pipeline.rs index 68f977f7ea6..e61d597b4b5 100644 --- a/components/compositing/pipeline.rs +++ b/components/compositing/pipeline.rs @@ -331,7 +331,7 @@ impl PipelineContent { self.parent_info, ScriptListener::new(script_to_compositor_chan), &layout_pair, - self.script_chan.clone(), + self.script_chan.0.clone(), mem::replace(&mut self.script_port, None).unwrap(), self.constellation_chan.clone(), self.failure.clone(), 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(), diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index c5dec4d5b4f..9ebeb1cd2e0 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -185,7 +185,7 @@ pub trait ScriptTaskFactory { parent_info: Option<(PipelineId, SubpageId)>, compositor: ScriptListener, layout_chan: &OpaqueScriptLayoutChannel, - control_chan: ScriptControlChan, + control_chan: Sender<ConstellationControlMsg>, control_port: Receiver<ConstellationControlMsg>, constellation_msg: ConstellationChan, failure_msg: Failure, |