diff options
Diffstat (limited to 'components/script/script_task.rs')
| -rw-r--r-- | components/script/script_task.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 953bf3dacde..b07b5086f45 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -80,7 +80,7 @@ use profile_traits::time::{self, ProfilerCategory, profile}; use script_traits::CompositorEvent::{KeyEvent, MouseButtonEvent, MouseMoveEvent, ResizeEvent}; use script_traits::CompositorEvent::{TouchEvent}; use script_traits::{CompositorEvent, ConstellationControlMsg, EventResult, InitialScriptState, NewLayoutInfo}; -use script_traits::{OpaqueScriptLayoutChannel, ScriptMsg as ConstellationMsg}; +use script_traits::{LayoutMsg, OpaqueScriptLayoutChannel, ScriptMsg as ConstellationMsg}; use script_traits::{ScriptTaskFactory, ScriptToCompositorMsg, TimerEvent, TimerEventRequest, TimerSource}; use script_traits::{TouchEventType, TouchId}; use std::any::Any; @@ -406,6 +406,9 @@ pub struct ScriptTask { /// For communicating load url messages to the constellation constellation_chan: ConstellationChan<ConstellationMsg>, + /// For communicating layout messages to the constellation + layout_to_constellation_chan: ConstellationChan<LayoutMsg>, + /// A handle to the compositor for communicating ready state messages. compositor: DOMRefCell<IpcSender<ScriptToCompositorMsg>>, @@ -669,6 +672,7 @@ impl ScriptTask { control_chan: state.control_chan, control_port: control_port, constellation_chan: state.constellation_chan, + layout_to_constellation_chan: state.layout_to_constellation_chan, compositor: DOMRefCell::new(state.compositor), time_profiler_chan: state.time_profiler_chan, mem_profiler_chan: state.mem_profiler_chan, @@ -1195,7 +1199,7 @@ impl ScriptTask { is_parent: false, layout_pair: layout_pair, pipeline_port: pipeline_port, - constellation_chan: self.constellation_chan.clone(), + constellation_chan: self.layout_to_constellation_chan.clone(), failure: failure, paint_chan: paint_chan, script_chan: self.control_chan.clone(), |