Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(966)

Unified Diff: content/browser/service_worker/service_worker_register_job.cc

Issue 238043002: Teach EmbeddedWorkerInstance to create a process when it needs one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Handle 2 places where context_ could be NULL. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/service_worker/service_worker_register_job.cc
diff --git a/content/browser/service_worker/service_worker_register_job.cc b/content/browser/service_worker/service_worker_register_job.cc
index 27b687ecad6cfaf4b8cd2c560a7996bd4ebf0b41..681930588a32d9371ed0401a340d9e87c4fa8857 100644
--- a/content/browser/service_worker/service_worker_register_job.cc
+++ b/content/browser/service_worker/service_worker_register_job.cc
@@ -43,14 +43,10 @@ ServiceWorkerRegisterJob::~ServiceWorkerRegisterJob() {
void ServiceWorkerRegisterJob::AddCallback(const RegistrationCallback& callback,
int process_id) {
- DCHECK_NE(-1, process_id);
- if (phase_ >= UPDATE && pending_version())
- pending_version()->AddProcessToWorker(process_id);
- else
- pending_process_ids_.push_back(process_id);
-
if (!is_promise_resolved_) {
callbacks_.push_back(callback);
+ if (process_id != -1 && (phase_ < UPDATE || !pending_version()))
+ pending_process_ids_.push_back(process_id);
return;
}
RunSoon(base::Bind(
@@ -228,15 +224,11 @@ void ServiceWorkerRegisterJob::UpdateAndContinue(
// the worker.
set_pending_version(new ServiceWorkerVersion(
registration(), context_->storage()->NewVersionId(), context_));
- for (std::vector<int>::const_iterator it = pending_process_ids_.begin();
- it != pending_process_ids_.end();
- ++it) {
- pending_version()->AddProcessToWorker(*it);
- }
// TODO(michaeln): Start the worker into a paused state where the
// script resource is downloaded but not yet evaluated.
- pending_version()->StartWorker(
+ pending_version()->StartWorkerWithCandidateProcesses(
+ pending_process_ids_,
base::Bind(&ServiceWorkerRegisterJob::OnStartWorkerFinished,
weak_factory_.GetWeakPtr()));
}

Powered by Google App Engine
This is Rietveld 408576698