Auto merge of #11607 - Ms2ger:shutdown-channels, r=asajeffrey

Remove the layout and paint shutdown channels

<!-- 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/11607)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-06-04 14:24:56 -05:00
commit 80a58cadc5
7 changed files with 26 additions and 60 deletions

View file

@ -232,6 +232,5 @@ pub struct NewLayoutThreadInfo {
pub script_chan: IpcSender<ConstellationControlMsg>,
pub image_cache_thread: ImageCacheThread,
pub paint_chan: OptionalOpaqueIpcSender,
pub layout_shutdown_chan: IpcSender<()>,
pub content_process_shutdown_chan: IpcSender<()>,
}

View file

@ -1129,7 +1129,6 @@ impl ScriptThread {
panic_chan,
pipeline_port,
layout_to_constellation_chan,
layout_shutdown_chan,
content_process_shutdown_chan,
} = new_layout_info;
@ -1147,7 +1146,6 @@ impl ScriptThread {
paint_chan: paint_chan,
script_chan: self.control_chan.clone(),
image_cache_thread: self.image_cache_thread.clone(),
layout_shutdown_chan: layout_shutdown_chan,
content_process_shutdown_chan: content_process_shutdown_chan,
};