diff options
| -rw-r--r-- | components/constellation/pipeline.rs | 10 | ||||
| -rw-r--r-- | components/layout/layout_thread.rs | 3 | ||||
| -rw-r--r-- | components/layout_traits/lib.rs | 1 | ||||
| -rw-r--r-- | components/script/layout_interface.rs | 1 | ||||
| -rw-r--r-- | components/script/script_thread.rs | 2 | ||||
| -rw-r--r-- | components/script_traits/lib.rs | 2 |
6 files changed, 0 insertions, 19 deletions
diff --git a/components/constellation/pipeline.rs b/components/constellation/pipeline.rs index 7718eb76036..a8bdb168e5f 100644 --- a/components/constellation/pipeline.rs +++ b/components/constellation/pipeline.rs @@ -55,7 +55,6 @@ pub struct Pipeline { /// A channel to the compositor. pub compositor_proxy: Box<CompositorProxy + 'static + Send>, pub chrome_to_paint_chan: Sender<ChromeToPaintMsg>, - pub layout_shutdown_port: IpcReceiver<()>, pub paint_shutdown_port: IpcReceiver<()>, /// URL corresponding to the most recently-loaded page. pub url: Url, @@ -132,8 +131,6 @@ impl Pipeline { let (chrome_to_paint_chan, chrome_to_paint_port) = channel(); let (paint_shutdown_chan, paint_shutdown_port) = ipc::channel() .expect("Pipeline paint shutdown chan"); - let (layout_shutdown_chan, layout_shutdown_port) = ipc::channel() - .expect("Pipeline layout shutdown chan"); let (pipeline_chan, pipeline_port) = ipc::channel() .expect("Pipeline main chan");; @@ -153,7 +150,6 @@ impl Pipeline { panic_chan: state.panic_chan.clone(), pipeline_port: pipeline_port, layout_to_constellation_chan: state.layout_to_constellation_chan.clone(), - layout_shutdown_chan: layout_shutdown_chan.clone(), content_process_shutdown_chan: layout_content_process_shutdown_chan.clone(), }; @@ -232,7 +228,6 @@ impl Pipeline { prefs: prefs::get_cloned(), layout_to_paint_chan: layout_to_paint_chan, pipeline_port: pipeline_port, - layout_shutdown_chan: layout_shutdown_chan, pipeline_namespace_id: state.pipeline_namespace_id, layout_content_process_shutdown_chan: layout_content_process_shutdown_chan, layout_content_process_shutdown_port: layout_content_process_shutdown_port, @@ -257,7 +252,6 @@ impl Pipeline { pipeline_chan, state.compositor_proxy, chrome_to_paint_chan, - layout_shutdown_port, paint_shutdown_port, state.load_data.url, state.window_size); @@ -271,7 +265,6 @@ impl Pipeline { layout_chan: IpcSender<LayoutControlMsg>, compositor_proxy: Box<CompositorProxy + 'static + Send>, chrome_to_paint_chan: Sender<ChromeToPaintMsg>, - layout_shutdown_port: IpcReceiver<()>, paint_shutdown_port: IpcReceiver<()>, url: Url, size: Option<TypedSize2D<PagePx, f32>>) @@ -283,7 +276,6 @@ impl Pipeline { layout_chan: layout_chan, compositor_proxy: compositor_proxy, chrome_to_paint_chan: chrome_to_paint_chan, - layout_shutdown_port: layout_shutdown_port, paint_shutdown_port: paint_shutdown_port, url: url, title: None, @@ -407,7 +399,6 @@ pub struct UnprivilegedPipelineContent { prefs: HashMap<String, Pref>, pipeline_port: IpcReceiver<LayoutControlMsg>, pipeline_namespace_id: PipelineNamespaceId, - layout_shutdown_chan: IpcSender<()>, layout_content_process_shutdown_chan: IpcSender<()>, layout_content_process_shutdown_port: IpcReceiver<()>, script_content_process_shutdown_chan: IpcSender<()>, @@ -452,7 +443,6 @@ impl UnprivilegedPipelineContent { self.font_cache_thread, self.time_profiler_chan, self.mem_profiler_chan, - self.layout_shutdown_chan, self.layout_content_process_shutdown_chan, self.webrender_api_sender); diff --git a/components/layout/layout_thread.rs b/components/layout/layout_thread.rs index 779a23fba82..b48813a0c31 100644 --- a/components/layout/layout_thread.rs +++ b/components/layout/layout_thread.rs @@ -259,7 +259,6 @@ impl LayoutThreadFactory for LayoutThread { font_cache_thread: FontCacheThread, time_profiler_chan: time::ProfilerChan, mem_profiler_chan: mem::ProfilerChan, - shutdown_chan: IpcSender<()>, content_process_shutdown_chan: IpcSender<()>, webrender_api_sender: Option<webrender_traits::RenderApiSender>) { thread::spawn_named_with_send_on_panic(format!("LayoutThread {:?}", id), @@ -286,7 +285,6 @@ impl LayoutThreadFactory for LayoutThread { layout.start(); }, reporter_name, sender, Msg::CollectReports); } - let _ = shutdown_chan.send(()); let _ = content_process_shutdown_chan.send(()); }, Some(id), panic_chan); } @@ -748,7 +746,6 @@ impl LayoutThread { self.font_cache_thread.clone(), self.time_profiler_chan.clone(), self.mem_profiler_chan.clone(), - info.layout_shutdown_chan, info.content_process_shutdown_chan, self.webrender_api.as_ref().map(|wr| wr.clone_sender())); } diff --git a/components/layout_traits/lib.rs b/components/layout_traits/lib.rs index 0b431e71639..ad91999cc30 100644 --- a/components/layout_traits/lib.rs +++ b/components/layout_traits/lib.rs @@ -48,7 +48,6 @@ pub trait LayoutThreadFactory { font_cache_thread: FontCacheThread, time_profiler_chan: time::ProfilerChan, mem_profiler_chan: mem::ProfilerChan, - shutdown_chan: IpcSender<()>, content_process_shutdown_chan: IpcSender<()>, webrender_api_sender: Option<webrender_traits::RenderApiSender>); } diff --git a/components/script/layout_interface.rs b/components/script/layout_interface.rs index 29dff179525..61c99bc530b 100644 --- a/components/script/layout_interface.rs +++ b/components/script/layout_interface.rs @@ -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<()>, } diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index ed2b0e03ee8..79cccc8ad00 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -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, }; diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 03bdf4b12b5..93239e5b42e 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -104,8 +104,6 @@ pub struct NewLayoutInfo { pub panic_chan: IpcSender<PanicMsg>, /// A sender for the layout thread to communicate to the constellation. pub layout_to_constellation_chan: IpcSender<LayoutMsg>, - /// A shutdown channel so that layout can notify others when it's done. - pub layout_shutdown_chan: IpcSender<()>, /// A shutdown channel so that layout can tell the content process to shut down when it's done. pub content_process_shutdown_chan: IpcSender<()>, } |