diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-06-08 12:41:37 -0500 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-06-08 12:41:37 -0500 |
| commit | 1b7ac699bc5bf21bc936386da5bc2296bcee6abb (patch) | |
| tree | 55c14ef2b73ca7ae9a333089a4644688744f9c8e | |
| parent | a8b3a07ea2498cb6dcddf6251c71d384153ba9a7 (diff) | |
| parent | ec1ab223c2749926426e213c50cf690d56d1db67 (diff) | |
| download | servo-1b7ac699bc5bf21bc936386da5bc2296bcee6abb.tar.gz servo-1b7ac699bc5bf21bc936386da5bc2296bcee6abb.zip | |
Auto merge of #11676 - Ms2ger:constellation-channels, r=asajeffrey
Create some channels on the constellation thread.
<!-- 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/11676)
<!-- Reviewable:end -->
| -rw-r--r-- | components/constellation/constellation.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs index aea7092b0df..cdf66a006fb 100644 --- a/components/constellation/constellation.rs +++ b/components/constellation/constellation.rs @@ -308,18 +308,18 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> STF: ScriptThreadFactory<Message=Message> { pub fn start(state: InitialConstellationState) -> Sender<FromCompositorMsg> { - let (ipc_script_sender, ipc_script_receiver) = ipc::channel().expect("ipc channel failure"); - let script_receiver = ROUTER.route_ipc_receiver_to_new_mpsc_receiver(ipc_script_receiver); + let (compositor_sender, compositor_receiver) = channel(); - let (ipc_layout_sender, ipc_layout_receiver) = ipc::channel().expect("ipc channel failure"); - let layout_receiver = ROUTER.route_ipc_receiver_to_new_mpsc_receiver(ipc_layout_receiver); + spawn_named("Constellation".to_owned(), move || { + let (ipc_script_sender, ipc_script_receiver) = ipc::channel().expect("ipc channel failure"); + let script_receiver = ROUTER.route_ipc_receiver_to_new_mpsc_receiver(ipc_script_receiver); - let (ipc_panic_sender, ipc_panic_receiver) = ipc::channel().expect("ipc channel failure"); - let panic_receiver = ROUTER.route_ipc_receiver_to_new_mpsc_receiver(ipc_panic_receiver); + let (ipc_layout_sender, ipc_layout_receiver) = ipc::channel().expect("ipc channel failure"); + let layout_receiver = ROUTER.route_ipc_receiver_to_new_mpsc_receiver(ipc_layout_receiver); - let (compositor_sender, compositor_receiver) = channel(); + let (ipc_panic_sender, ipc_panic_receiver) = ipc::channel().expect("ipc channel failure"); + let panic_receiver = ROUTER.route_ipc_receiver_to_new_mpsc_receiver(ipc_panic_receiver); - spawn_named("Constellation".to_owned(), move || { let mut constellation: Constellation<Message, LTF, STF> = Constellation { script_sender: ipc_script_sender, layout_sender: ipc_layout_sender, |