diff options
author | Keith Yeung <kungfukeith11@gmail.com> | 2015-11-14 16:01:34 -0800 |
---|---|---|
committer | Keith Yeung <kungfukeith11@gmail.com> | 2015-11-16 23:10:53 -0800 |
commit | 19294db6e5ffc9e85b4b628ef8dc6c72636c70a7 (patch) | |
tree | 60c26784064e9fecc12f8bd7b44686ceb7b8472a /components/compositing/pipeline.rs | |
parent | afe03870ce1a5a65b4c22f2e64155259da8b4609 (diff) | |
download | servo-19294db6e5ffc9e85b4b628ef8dc6c72636c70a7.tar.gz servo-19294db6e5ffc9e85b4b628ef8dc6c72636c70a7.zip |
Split ConstellationMsg into ScriptMsg and CompositorMsg
Diffstat (limited to 'components/compositing/pipeline.rs')
-rw-r--r-- | components/compositing/pipeline.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/compositing/pipeline.rs b/components/compositing/pipeline.rs index febd879768e..8742898eaa4 100644 --- a/components/compositing/pipeline.rs +++ b/components/compositing/pipeline.rs @@ -14,6 +14,7 @@ use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; use ipc_channel::router::ROUTER; use layers::geometry::DevicePixel; use layout_traits::{LayoutControlChan, LayoutTaskFactory}; +use msg::constellation_msg::ScriptMsg as ConstellationMsg; use msg::constellation_msg::{ConstellationChan, Failure, FrameId, PipelineId, SubpageId}; use msg::constellation_msg::{LoadData, MozBrowserEvent, WindowSizeData}; use msg::constellation_msg::{PipelineNamespaceId}; @@ -78,7 +79,7 @@ pub struct InitialPipelineState { /// If `None`, this is the root. pub parent_info: Option<(PipelineId, SubpageId)>, /// A channel to the associated constellation. - pub constellation_chan: ConstellationChan, + pub constellation_chan: ConstellationChan<ConstellationMsg>, /// A channel to schedule timer events. pub scheduler_chan: IpcSender<TimerEventRequest>, /// A channel to the compositor. @@ -317,7 +318,7 @@ impl Pipeline { pub struct PipelineContent { id: PipelineId, parent_info: Option<(PipelineId, SubpageId)>, - constellation_chan: ConstellationChan, + constellation_chan: ConstellationChan<ConstellationMsg>, scheduler_chan: IpcSender<TimerEventRequest>, compositor_proxy: Box<CompositorProxy + Send + 'static>, devtools_chan: Option<IpcSender<ScriptToDevtoolsControlMsg>>, |