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

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

Issue 188283003: Add ServiceWorkerVersion::status() (which is to be persisted unlike running status) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 d706968780570336023cf3aeae48d8c1bfb551fa..1d677de369a3520fd17f1dc293b029eb103de72e 100644
--- a/content/browser/service_worker/service_worker_register_job.cc
+++ b/content/browser/service_worker/service_worker_register_job.cc
@@ -111,7 +111,9 @@ void ServiceWorkerRegisterJob::StartWorkerAndContinue(
}
pending_version_ = new ServiceWorkerVersion(
- registration_, worker_registry_, registration_->next_version_id());
+ registration_, worker_registry_,
+ storage_->NewVersionId(),
+ ServiceWorkerVersion::NEW);
for (std::vector<int>::const_iterator it = pending_process_ids_.begin();
it != pending_process_ids_.end();
++it)
@@ -124,7 +126,8 @@ void ServiceWorkerRegisterJob::StartWorkerAndContinue(
pending_version_->StartWorker(callback);
// TODO(alecflett): Don't set the active version until just before
- // the activate event is dispatched.
+ // the install/activate event is dispatched.
alecflett 2014/03/06 19:10:24 I don't think adding "install/" is right - we want
michaeln 2014/03/06 19:49:54 Regarding setting before, what if activate fails?
kinuko 2014/03/10 10:36:56 I overlooked the 'just before' phrasing, just want
+ pending_version_->set_status(ServiceWorkerVersion::ACTIVE);
registration_->set_active_version(pending_version_);
}

Powered by Google App Engine
This is Rietveld 408576698