aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout_traits/lib.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-05-19 12:38:26 -0700
committerbors-servo <lbergstrom+bors@mozilla.com>2016-05-19 12:38:26 -0700
commit27c25e859a45c3d79c85e96b85ec5226a3231e10 (patch)
treeb791aaf1184a1223f27c36bacb10ea35f6dcf494 /components/layout_traits/lib.rs
parent5bf28491605096e85c6170a7c419e3f8077715bc (diff)
parentcc2b2b50a74515700b6cae88c66e734312d1fdbb (diff)
downloadservo-27c25e859a45c3d79c85e96b85ec5226a3231e10.tar.gz
servo-27c25e859a45c3d79c85e96b85ec5226a3231e10.zip
Auto merge of #11270 - servo:ConstellationChan, r=asajeffrey
Remove ConstellationChan. Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy --faster` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). Either: - [ ] There are tests for these changes OR - [x] These changes do not require tests because _____ Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. 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. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11270) <!-- Reviewable:end -->
Diffstat (limited to 'components/layout_traits/lib.rs')
-rw-r--r--components/layout_traits/lib.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/layout_traits/lib.rs b/components/layout_traits/lib.rs
index efc24f33fc3..0b12676b0db 100644
--- a/components/layout_traits/lib.rs
+++ b/components/layout_traits/lib.rs
@@ -26,7 +26,7 @@ extern crate webrender_traits;
use gfx::font_cache_thread::FontCacheThread;
use gfx::paint_thread::LayoutToPaintMsg;
use ipc_channel::ipc::{IpcReceiver, IpcSender};
-use msg::constellation_msg::{ConstellationChan, PanicMsg, PipelineId, PipelineNamespaceId, PipelineIndex};
+use msg::constellation_msg::{PanicMsg, PipelineId, PipelineNamespaceId, PipelineIndex};
use net_traits::image_cache_thread::ImageCacheThread;
use profile_traits::{mem, time};
use script_traits::LayoutMsg as ConstellationMsg;
@@ -48,8 +48,8 @@ pub trait LayoutThreadFactory {
is_iframe: bool,
chan: OpaqueScriptLayoutChannel,
pipeline_port: IpcReceiver<LayoutControlMsg>,
- constellation_chan: ConstellationChan<ConstellationMsg>,
- panic_chan: ConstellationChan<PanicMsg>,
+ constellation_chan: IpcSender<ConstellationMsg>,
+ panic_chan: IpcSender<PanicMsg>,
script_chan: IpcSender<ConstellationControlMsg>,
layout_to_paint_chan: OptionalIpcSender<LayoutToPaintMsg>,
image_cache_thread: ImageCacheThread,