Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Take PrivilegedPipelineContent::script_to_compositor_port out of its Option.

Browse source
This commit is contained in:
Ms2ger 2015-11-26 10:17:18 +01:00
parent 6eff8d6c32
commit 8dadd1a420
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/compositing/pipeline.rs
View file

@ -239,7 +239,7 @@ impl Pipeline {
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: Some(chrome_to_paint_port),
paint_shutdown_chan: paint_shutdown_chan, paint_shutdown_chan: paint_shutdown_chan,
script_to_compositor_port: Some(script_to_compositor_port), script_to_compositor_port: script_to_compositor_port,
}; };
(pipeline, unprivileged_pipeline_content, privileged_pipeline_content) (pipeline, unprivileged_pipeline_content, privileged_pipeline_content)
@ -433,7 +433,7 @@ pub struct PrivilegedPipelineContent {
id: PipelineId, id: PipelineId,
painter_chan: ConstellationChan<PaintMsg>, painter_chan: ConstellationChan<PaintMsg>,
compositor_proxy: Box<CompositorProxy + Send + 'static>, compositor_proxy: Box<CompositorProxy + Send + 'static>,
script_to_compositor_port: Option<IpcReceiver<ScriptToCompositorMsg>>, script_to_compositor_port: IpcReceiver<ScriptToCompositorMsg>,
font_cache_task: FontCacheTask, font_cache_task: FontCacheTask,
time_profiler_chan: time::ProfilerChan, time_profiler_chan: time::ProfilerChan,
mem_profiler_chan: profile_mem::ProfilerChan, mem_profiler_chan: profile_mem::ProfilerChan,
@ -446,13 +446,12 @@ pub struct PrivilegedPipelineContent {
} }
impl PrivilegedPipelineContent { impl PrivilegedPipelineContent {
pub fn start_all(&mut self) { pub fn start_all(mut self) {
self.start_paint_task(); self.start_paint_task();
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();
let script_to_compositor_port = let script_to_compositor_port = self.script_to_compositor_port;
mem::replace(&mut self.script_to_compositor_port, None).unwrap();
thread::spawn(move || { thread::spawn(move || {
compositor_task::run_script_listener_thread( compositor_task::run_script_listener_thread(
compositor_proxy_for_script_listener_thread, compositor_proxy_for_script_listener_thread,