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

Move the Pipeline creation to the end of Pipeline::spawn().

Browse source
This commit is contained in:
Ms2ger 2016-05-26 11:26:09 +02:00
parent f6ae542c15
commit 948b69f503
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
components/constellation/pipeline.rs
View file

@ -168,23 +168,12 @@ impl Pipeline {
} }
}; };
let pipeline = Pipeline::new(state.id,
state.parent_info,
script_chan.clone(),
LayoutControlChan(pipeline_chan),
state.compositor_proxy.clone_compositor_proxy(),
chrome_to_paint_chan.clone(),
layout_shutdown_port,
paint_shutdown_port,
state.load_data.url.clone(),
state.window_size);
PaintThread::create(state.id, PaintThread::create(state.id,
state.load_data.url.clone(), state.load_data.url.clone(),
chrome_to_paint_chan, chrome_to_paint_chan.clone(),
layout_to_paint_port, layout_to_paint_port,
chrome_to_paint_port, chrome_to_paint_port,
state.compositor_proxy, state.compositor_proxy.clone_compositor_proxy(),
state.panic_chan.clone(), state.panic_chan.clone(),
state.font_cache_thread.clone(), state.font_cache_thread.clone(),
state.time_profiler_chan.clone(), state.time_profiler_chan.clone(),
@ -235,8 +224,8 @@ impl Pipeline {
mem_profiler_chan: state.mem_profiler_chan, mem_profiler_chan: state.mem_profiler_chan,
window_size: window_size, window_size: window_size,
layout_to_constellation_chan: state.layout_to_constellation_chan, layout_to_constellation_chan: state.layout_to_constellation_chan,
script_chan: script_chan, script_chan: script_chan.clone(),
load_data: state.load_data, load_data: state.load_data.clone(),
panic_chan: state.panic_chan, panic_chan: state.panic_chan,
script_port: script_port, script_port: script_port,
opts: (*opts::get()).clone(), opts: (*opts::get()).clone(),
@ -263,6 +252,17 @@ impl Pipeline {
} }
} }
let pipeline = Pipeline::new(state.id,
state.parent_info,
script_chan,
LayoutControlChan(pipeline_chan),
state.compositor_proxy,
chrome_to_paint_chan,
layout_shutdown_port,
paint_shutdown_port,
state.load_data.url,
state.window_size);
Ok((pipeline, child_process)) Ok((pipeline, child_process))
} }