mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Introduce Pipeline::spawn().
This commit is contained in:
parent
82832f134b
commit
739e091e8b
2 changed files with 59 additions and 42 deletions
|
@ -120,10 +120,8 @@ pub struct InitialPipelineState {
|
|||
}
|
||||
|
||||
impl Pipeline {
|
||||
/// Starts a paint thread, layout thread, and possibly a script thread.
|
||||
/// Returns the channels wrapped in a struct.
|
||||
pub fn create<LTF, STF>(state: InitialPipelineState)
|
||||
-> (Pipeline, UnprivilegedPipelineContent, PrivilegedPipelineContent)
|
||||
fn create<LTF, STF>(state: InitialPipelineState)
|
||||
-> (Pipeline, UnprivilegedPipelineContent, PrivilegedPipelineContent)
|
||||
where LTF: LayoutThreadFactory,
|
||||
STF: ScriptThreadFactory
|
||||
{
|
||||
|
@ -256,6 +254,34 @@ impl Pipeline {
|
|||
(pipeline, unprivileged_pipeline_content, privileged_pipeline_content)
|
||||
}
|
||||
|
||||
/// Starts a paint thread, layout thread, and possibly a script thread, in
|
||||
/// a new process if requested.
|
||||
pub fn spawn<Message, LTF, STF>(state: InitialPipelineState)
|
||||
-> Result<(Pipeline, Option<ChildProcess>), IOError>
|
||||
where LTF: LayoutThreadFactory<Message=Message>,
|
||||
STF: ScriptThreadFactory<Message=Message>
|
||||
{
|
||||
let spawning_content = state.script_chan.is_none();
|
||||
let (pipeline, unprivileged_pipeline_content, privileged_pipeline_content) =
|
||||
Pipeline::create::<LTF, STF>(state);
|
||||
|
||||
privileged_pipeline_content.start();
|
||||
|
||||
let mut child_process = None;
|
||||
if spawning_content {
|
||||
// Spawn the child process.
|
||||
//
|
||||
// Yes, that's all there is to it!
|
||||
if opts::multiprocess() {
|
||||
child_process = Some(try!(unprivileged_pipeline_content.spawn_multiprocess()));
|
||||
} else {
|
||||
unprivileged_pipeline_content.start_all::<Message, LTF, STF>(false);
|
||||
}
|
||||
}
|
||||
|
||||
Ok((pipeline, child_process))
|
||||
}
|
||||
|
||||
fn new(id: PipelineId,
|
||||
parent_info: Option<(PipelineId, SubpageId, FrameType)>,
|
||||
script_chan: IpcSender<ConstellationControlMsg>,
|
||||
|
@ -520,7 +546,7 @@ impl UnprivilegedPipelineContent {
|
|||
}
|
||||
}
|
||||
|
||||
pub struct PrivilegedPipelineContent {
|
||||
struct PrivilegedPipelineContent {
|
||||
id: PipelineId,
|
||||
compositor_proxy: Box<CompositorProxy + Send + 'static>,
|
||||
font_cache_thread: FontCacheThread,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue