From cc2b2b50a74515700b6cae88c66e734312d1fdbb Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Thu, 19 May 2016 16:53:52 +0200
Subject: Remove ConstellationChan.

It's a pointless abstraction that propagates the obsolete chan terminology,
swaps the order in which the sender and receiver are returned, and hides a
source of panics.
---
 components/script/layout_interface.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'components/script/layout_interface.rs')

diff --git a/components/script/layout_interface.rs b/components/script/layout_interface.rs
index 2a9598fcc8b..2a6e0b1d79a 100644
--- a/components/script/layout_interface.rs
+++ b/components/script/layout_interface.rs
@@ -12,8 +12,7 @@ use euclid::point::Point2D;
 use euclid::rect::Rect;
 use gfx_traits::{Epoch, LayerId};
 use ipc_channel::ipc::{IpcReceiver, IpcSender};
-use msg::constellation_msg::{ConstellationChan, PanicMsg, PipelineId};
-use msg::constellation_msg::{WindowSizeData};
+use msg::constellation_msg::{PanicMsg, PipelineId, WindowSizeData};
 use net_traits::image_cache_thread::ImageCacheThread;
 use profile_traits::mem::ReportsChan;
 use script_traits::{ConstellationControlMsg, LayoutControlMsg, LayoutMsg as ConstellationMsg};
@@ -262,8 +261,8 @@ pub struct NewLayoutThreadInfo {
     pub is_parent: bool,
     pub layout_pair: OpaqueScriptLayoutChannel,
     pub pipeline_port: IpcReceiver<LayoutControlMsg>,
-    pub constellation_chan: ConstellationChan<ConstellationMsg>,
-    pub panic_chan: ConstellationChan<PanicMsg>,
+    pub constellation_chan: IpcSender<ConstellationMsg>,
+    pub panic_chan: IpcSender<PanicMsg>,
     pub script_chan: IpcSender<ConstellationControlMsg>,
     pub image_cache_thread: ImageCacheThread,
     pub paint_chan: OptionalOpaqueIpcSender,
-- 
cgit v1.2.3