Chromium Code Reviews| 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_); |
| } |