Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-08 08:33:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove the layout shutdown channel.

Browse source 
Nobody is listening.
This commit is contained in:
Ms2ger 2016-06-04 11:14:02 +02:00
parent 6581e3504a
commit 021b9e3239
6 changed files with 0 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/constellation/pipeline.rs
View file

@ -55,7 +55,6 @@ pub struct Pipeline {
/// A channel to the compositor. /// A channel to the compositor.
pub compositor_proxy: Box<CompositorProxy + 'static + Send>, pub compositor_proxy: Box<CompositorProxy + 'static + Send>,
pub chrome_to_paint_chan: Sender<ChromeToPaintMsg>, pub chrome_to_paint_chan: Sender<ChromeToPaintMsg>,
pub layout_shutdown_port: IpcReceiver<()>,
pub paint_shutdown_port: IpcReceiver<()>, pub paint_shutdown_port: IpcReceiver<()>,
/// URL corresponding to the most recently-loaded page. /// URL corresponding to the most recently-loaded page.
pub url: Url, pub url: Url,
@ -132,8 +131,6 @@ impl Pipeline {
let (chrome_to_paint_chan, chrome_to_paint_port) = channel(); let (chrome_to_paint_chan, chrome_to_paint_port) = channel();
let (paint_shutdown_chan, paint_shutdown_port) = ipc::channel() let (paint_shutdown_chan, paint_shutdown_port) = ipc::channel()
.expect("Pipeline paint shutdown chan"); .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() let (pipeline_chan, pipeline_port) = ipc::channel()
.expect("Pipeline main chan");; .expect("Pipeline main chan");;
@ -153,7 +150,6 @@ impl Pipeline {
panic_chan: state.panic_chan.clone(), panic_chan: state.panic_chan.clone(),
pipeline_port: pipeline_port, pipeline_port: pipeline_port,
layout_to_constellation_chan: state.layout_to_constellation_chan.clone(), 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(), content_process_shutdown_chan: layout_content_process_shutdown_chan.clone(),
}; };
@ -232,7 +228,6 @@ impl Pipeline {
prefs: prefs::get_cloned(), prefs: prefs::get_cloned(),
layout_to_paint_chan: layout_to_paint_chan, layout_to_paint_chan: layout_to_paint_chan,
pipeline_port: pipeline_port, pipeline_port: pipeline_port,
layout_shutdown_chan: layout_shutdown_chan,
pipeline_namespace_id: state.pipeline_namespace_id, pipeline_namespace_id: state.pipeline_namespace_id,
layout_content_process_shutdown_chan: layout_content_process_shutdown_chan, layout_content_process_shutdown_chan: layout_content_process_shutdown_chan,
layout_content_process_shutdown_port: layout_content_process_shutdown_port, layout_content_process_shutdown_port: layout_content_process_shutdown_port,
@ -257,7 +252,6 @@ impl Pipeline {
pipeline_chan, pipeline_chan,
state.compositor_proxy, state.compositor_proxy,
chrome_to_paint_chan, chrome_to_paint_chan,
layout_shutdown_port,
paint_shutdown_port, paint_shutdown_port,
state.load_data.url, state.load_data.url,
state.window_size); state.window_size);
@ -271,7 +265,6 @@ impl Pipeline {
layout_chan: IpcSender<LayoutControlMsg>, layout_chan: IpcSender<LayoutControlMsg>,
compositor_proxy: Box<CompositorProxy + 'static + Send>, compositor_proxy: Box<CompositorProxy + 'static + Send>,
chrome_to_paint_chan: Sender<ChromeToPaintMsg>, chrome_to_paint_chan: Sender<ChromeToPaintMsg>,
layout_shutdown_port: IpcReceiver<()>,
paint_shutdown_port: IpcReceiver<()>, paint_shutdown_port: IpcReceiver<()>,
url: Url, url: Url,
size: Option<TypedSize2D<PagePx, f32>>) size: Option<TypedSize2D<PagePx, f32>>)
@ -283,7 +276,6 @@ impl Pipeline {
layout_chan: layout_chan, layout_chan: layout_chan,
compositor_proxy: compositor_proxy, compositor_proxy: compositor_proxy,
chrome_to_paint_chan: chrome_to_paint_chan, chrome_to_paint_chan: chrome_to_paint_chan,
layout_shutdown_port: layout_shutdown_port,
paint_shutdown_port: paint_shutdown_port, paint_shutdown_port: paint_shutdown_port,
url: url, url: url,
title: None, title: None,
@ -407,7 +399,6 @@ pub struct UnprivilegedPipelineContent {
prefs: HashMap<String, Pref>, prefs: HashMap<String, Pref>,
pipeline_port: IpcReceiver<LayoutControlMsg>, pipeline_port: IpcReceiver<LayoutControlMsg>,
pipeline_namespace_id: PipelineNamespaceId, pipeline_namespace_id: PipelineNamespaceId,
layout_shutdown_chan: IpcSender<()>,
layout_content_process_shutdown_chan: IpcSender<()>, layout_content_process_shutdown_chan: IpcSender<()>,
layout_content_process_shutdown_port: IpcReceiver<()>, layout_content_process_shutdown_port: IpcReceiver<()>,
script_content_process_shutdown_chan: IpcSender<()>, script_content_process_shutdown_chan: IpcSender<()>,
@ -452,7 +443,6 @@ impl UnprivilegedPipelineContent {
self.font_cache_thread, self.font_cache_thread,
self.time_profiler_chan, self.time_profiler_chan,
self.mem_profiler_chan, self.mem_profiler_chan,
self.layout_shutdown_chan,
self.layout_content_process_shutdown_chan, self.layout_content_process_shutdown_chan,
self.webrender_api_sender); self.webrender_api_sender);

3
components/layout/layout_thread.rs
View file

@ -259,7 +259,6 @@ impl LayoutThreadFactory for LayoutThread {
font_cache_thread: FontCacheThread, font_cache_thread: FontCacheThread,
time_profiler_chan: time::ProfilerChan, time_profiler_chan: time::ProfilerChan,
mem_profiler_chan: mem::ProfilerChan, mem_profiler_chan: mem::ProfilerChan,
shutdown_chan: IpcSender<()>,
content_process_shutdown_chan: IpcSender<()>, content_process_shutdown_chan: IpcSender<()>,
webrender_api_sender: Option<webrender_traits::RenderApiSender>) { webrender_api_sender: Option<webrender_traits::RenderApiSender>) {
thread::spawn_named_with_send_on_panic(format!("LayoutThread {:?}", id), thread::spawn_named_with_send_on_panic(format!("LayoutThread {:?}", id),
@ -286,7 +285,6 @@ impl LayoutThreadFactory for LayoutThread {
layout.start(); layout.start();
}, reporter_name, sender, Msg::CollectReports); }, reporter_name, sender, Msg::CollectReports);
} }
let _ = shutdown_chan.send(());
let _ = content_process_shutdown_chan.send(()); let _ = content_process_shutdown_chan.send(());
}, Some(id), panic_chan); }, Some(id), panic_chan);
} }
@ -748,7 +746,6 @@ impl LayoutThread {
self.font_cache_thread.clone(), self.font_cache_thread.clone(),
self.time_profiler_chan.clone(), self.time_profiler_chan.clone(),
self.mem_profiler_chan.clone(), self.mem_profiler_chan.clone(),
info.layout_shutdown_chan,
info.content_process_shutdown_chan, info.content_process_shutdown_chan,
self.webrender_api.as_ref().map(|wr| wr.clone_sender())); self.webrender_api.as_ref().map(|wr| wr.clone_sender()));
} }

1
components/layout_traits/lib.rs
View file

@ -48,7 +48,6 @@ pub trait LayoutThreadFactory {
font_cache_thread: FontCacheThread, font_cache_thread: FontCacheThread,
time_profiler_chan: time::ProfilerChan, time_profiler_chan: time::ProfilerChan,
mem_profiler_chan: mem::ProfilerChan, mem_profiler_chan: mem::ProfilerChan,
shutdown_chan: IpcSender<()>,
content_process_shutdown_chan: IpcSender<()>, content_process_shutdown_chan: IpcSender<()>,
webrender_api_sender: Option<webrender_traits::RenderApiSender>); webrender_api_sender: Option<webrender_traits::RenderApiSender>);
} }

1
components/script/layout_interface.rs
View file

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

2
components/script/script_thread.rs
View file

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

2
components/script_traits/lib.rs
View file

@ -104,8 +104,6 @@ pub struct NewLayoutInfo {
pub panic_chan: IpcSender<PanicMsg>, pub panic_chan: IpcSender<PanicMsg>,
/// A sender for the layout thread to communicate to the constellation. /// A sender for the layout thread to communicate to the constellation.
pub layout_to_constellation_chan: IpcSender<LayoutMsg>, 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. /// A shutdown channel so that layout can tell the content process to shut down when it's done.
pub content_process_shutdown_chan: IpcSender<()>, pub content_process_shutdown_chan: IpcSender<()>,
} }