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 b68cd30f8199d6812f9ace3a66c4f1534cb5e43d..2fa35337719dcb543e04539c5b47ee6e33c5bc46 100644 |
--- a/content/browser/service_worker/service_worker_register_job.cc |
+++ b/content/browser/service_worker/service_worker_register_job.cc |
@@ -426,11 +426,14 @@ void ServiceWorkerRegisterJob::OnStoreRegistrationComplete( |
// and "installed" as the arguments." |
new_version()->SetStatus(ServiceWorkerVersion::INSTALLED); |
- // TODO(michaeln): "13. If activateImmediate is true, then..." |
- |
- // "14. Wait until no document is using registration as their |
- // Service Worker registration." |
- registration()->ActivateWaitingVersionWhenReady(); |
+ // "If registration's waiting worker's skip waiting flag is set:" |
+ if (new_version()->skip_waiting()) { |
+ registration()->ActivateWaitingVersion(); |
+ } else { |
+ // "14. Wait until no document is using registration as their |
+ // Service Worker registration." |
+ registration()->ActivateWaitingVersionWhenReady(); |
+ } |
Complete(SERVICE_WORKER_OK); |
} |