Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Consume self in PrivilegedPipelineContent methods.

Browse source 
This leads to a little bit of copy/paste, but the resulting code should be
quite a bit more efficient.
This commit is contained in:
Ms2ger 2015-11-26 10:23:11 +01:00
parent 8dadd1a420
commit 9d73b869db
2 changed files with 31 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/compositing/constellation.rs
View file

@ -362,7 +362,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
script_channel: Option<IpcSender<ConstellationControlMsg>>, script_channel: Option<IpcSender<ConstellationControlMsg>>,
load_data: LoadData) { load_data: LoadData) {
let spawning_paint_only = script_channel.is_some(); let spawning_paint_only = script_channel.is_some();
let (pipeline, unprivileged_pipeline_content, mut privileged_pipeline_content) = let (pipeline, unprivileged_pipeline_content, privileged_pipeline_content) =
Pipeline::create::<LTF, STF>(InitialPipelineState { Pipeline::create::<LTF, STF>(InitialPipelineState {
id: pipeline_id, id: pipeline_id,
parent_info: parent_info, parent_info: parent_info,

49
components/compositing/pipeline.rs
View file

@ -235,9 +235,9 @@ impl Pipeline {
mem_profiler_chan: state.mem_profiler_chan, mem_profiler_chan: state.mem_profiler_chan,
load_data: state.load_data, load_data: state.load_data,
failure: failure, failure: failure,
layout_to_paint_port: Some(layout_to_paint_port), layout_to_paint_port: layout_to_paint_port,
chrome_to_paint_chan: chrome_to_paint_chan, chrome_to_paint_chan: chrome_to_paint_chan,
chrome_to_paint_port: Some(chrome_to_paint_port), chrome_to_paint_port: chrome_to_paint_port,
paint_shutdown_chan: paint_shutdown_chan, paint_shutdown_chan: paint_shutdown_chan,
script_to_compositor_port: script_to_compositor_port, script_to_compositor_port: script_to_compositor_port,
}; };
@ -384,7 +384,7 @@ impl UnprivilegedPipelineContent {
ScriptTaskFactory::create(None::<&mut STF>, InitialScriptState { ScriptTaskFactory::create(None::<&mut STF>, InitialScriptState {
id: self.id, id: self.id,
parent_info: self.parent_info, parent_info: self.parent_info,
compositor: self.script_to_compositor_chan.clone(), compositor: self.script_to_compositor_chan,
control_chan: self.script_chan.clone(), control_chan: self.script_chan.clone(),
control_port: mem::replace(&mut self.script_port, None).unwrap(), control_port: mem::replace(&mut self.script_port, None).unwrap(),
constellation_chan: self.constellation_chan.clone(), constellation_chan: self.constellation_chan.clone(),
@ -439,15 +439,26 @@ pub struct PrivilegedPipelineContent {
mem_profiler_chan: profile_mem::ProfilerChan, mem_profiler_chan: profile_mem::ProfilerChan,
load_data: LoadData, load_data: LoadData,
failure: Failure, failure: Failure,
layout_to_paint_port: Option<Receiver<LayoutToPaintMsg>>, layout_to_paint_port: Receiver<LayoutToPaintMsg>,
chrome_to_paint_chan: Sender<ChromeToPaintMsg>, chrome_to_paint_chan: Sender<ChromeToPaintMsg>,
chrome_to_paint_port: Option<Receiver<ChromeToPaintMsg>>, chrome_to_paint_port: Receiver<ChromeToPaintMsg>,
paint_shutdown_chan: IpcSender<()>, paint_shutdown_chan: IpcSender<()>,
} }
impl PrivilegedPipelineContent { impl PrivilegedPipelineContent {
pub fn start_all(mut self) { pub fn start_all(self) {
self.start_paint_task(); PaintTask::create(self.id,
self.load_data.url,
self.chrome_to_paint_chan,
self.layout_to_paint_port,
self.chrome_to_paint_port,
self.compositor_proxy.clone_compositor_proxy(),
self.painter_chan,
self.font_cache_task,
self.failure,
self.time_profiler_chan,
self.mem_profiler_chan,
self.paint_shutdown_chan);
let compositor_proxy_for_script_listener_thread = let compositor_proxy_for_script_listener_thread =
self.compositor_proxy.clone_compositor_proxy(); self.compositor_proxy.clone_compositor_proxy();
@ -459,19 +470,19 @@ impl PrivilegedPipelineContent {
}); });
} }
pub fn start_paint_task(&mut self) { pub fn start_paint_task(self) {
PaintTask::create(self.id, PaintTask::create(self.id,
self.load_data.url.clone(), self.load_data.url,
self.chrome_to_paint_chan.clone(), self.chrome_to_paint_chan,
mem::replace(&mut self.layout_to_paint_port, None).unwrap(), self.layout_to_paint_port,
mem::replace(&mut self.chrome_to_paint_port, None).unwrap(), self.chrome_to_paint_port,
self.compositor_proxy.clone_compositor_proxy(), self.compositor_proxy,
self.painter_chan.clone(), self.painter_chan,
self.font_cache_task.clone(), self.font_cache_task,
self.failure.clone(), self.failure,
self.time_profiler_chan.clone(), self.time_profiler_chan,
self.mem_profiler_chan.clone(), self.mem_profiler_chan,
self.paint_shutdown_chan.clone()); self.paint_shutdown_chan);
} }
} }