diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-08-12 08:28:29 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-08-12 08:28:29 -0600 |
| commit | 3ad49fc689ceb6067cd6dea1aa0d004321704b8e (patch) | |
| tree | 1b474bd22e9b010b617a0d977ab189c88bfdf2ce /components/layout_traits/lib.rs | |
| parent | 54300a9c73f7c8289604ab9a957419577e10c1ac (diff) | |
| parent | 2cdc043fcf574b96204f32e9cc95b02dee270d01 (diff) | |
| download | servo-3ad49fc689ceb6067cd6dea1aa0d004321704b8e.tar.gz servo-3ad49fc689ceb6067cd6dea1aa0d004321704b8e.zip | |
Auto merge of #7171 - Ms2ger:ScriptControlChan, r=jdm
Remove ScriptControlChan.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7171)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout_traits/lib.rs')
| -rw-r--r-- | components/layout_traits/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/layout_traits/lib.rs b/components/layout_traits/lib.rs index d75817911a7..16b3bdcda06 100644 --- a/components/layout_traits/lib.rs +++ b/components/layout_traits/lib.rs @@ -28,7 +28,7 @@ use msg::constellation_msg::{ConstellationChan, Failure, PipelineId}; use profile_traits::mem; use profile_traits::time; use net_traits::image_cache_task::ImageCacheTask; -use script_traits::{LayoutControlMsg, ScriptControlChan, OpaqueScriptLayoutChannel}; +use script_traits::{LayoutControlMsg, ConstellationControlMsg, OpaqueScriptLayoutChannel}; use std::sync::mpsc::Sender; use url::Url; use util::ipc::OptionalIpcSender; @@ -49,7 +49,7 @@ pub trait LayoutTaskFactory { pipeline_port: IpcReceiver<LayoutControlMsg>, constellation_chan: ConstellationChan, failure_msg: Failure, - script_chan: ScriptControlChan, + script_chan: Sender<ConstellationControlMsg>, layout_to_paint_chan: OptionalIpcSender<LayoutToPaintMsg>, image_cache_task: ImageCacheTask, font_cache_task: FontCacheTask, |