Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the script listener thread. #11410

Merged
merged 2 commits into from May 25, 2016
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev

Merge PrivilegedPipelineContent::{start_all, start_paint_thread}.

They now do the same thing.
  • Loading branch information
Ms2ger committed May 25, 2016
commit e7f75ca2983105fb9005616718f52b493210135f
@@ -423,7 +423,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
initial_window_size: Option<TypedSize2D<PagePx, f32>>,
script_channel: Option<IpcSender<ConstellationControlMsg>>,
load_data: LoadData) {
let spawning_paint_only = script_channel.is_some();
let spawning_content = script_channel.is_none();
let (pipeline, unprivileged_pipeline_content, privileged_pipeline_content) =
Pipeline::create::<LTF, STF>(InitialPipelineState {
id: pipeline_id,
@@ -448,11 +448,9 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
webrender_api_sender: self.webrender_api_sender.clone(),
});

if spawning_paint_only {
privileged_pipeline_content.start_paint_thread();
} else {
privileged_pipeline_content.start_all();
privileged_pipeline_content.start();

if spawning_content {
// Spawn the child process.
//
// Yes, that's all there is to it!
@@ -471,11 +471,7 @@ pub struct PrivilegedPipelineContent {
}

impl PrivilegedPipelineContent {
pub fn start_all(self) {
self.start_paint_thread();
}

pub fn start_paint_thread(self) {
pub fn start(self) {
PaintThread::create(self.id,
self.load_data.url,
self.chrome_to_paint_chan,
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.