ServiceWorker: Add support for .skipWaiting and controllerchange event(2/3)

content/browser/service_worker/service_worker_registration.cc

Index: content/browser/service_worker/service_worker_registration.cc
diff --git a/content/browser/service_worker/service_worker_registration.cc b/content/browser/service_worker/service_worker_registration.cc
index 0445f08f7e646ba73497be4257adeb4d6ad008c3..91418f37f6b2388a4a2b87363ccae704622a9f5f 100644
--- a/content/browser/service_worker/service_worker_registration.cc
+++ b/content/browser/service_worker/service_worker_registration.cc
@@ -154,7 +154,8 @@ void ServiceWorkerRegistration::UnsetVersionInternal(
 void ServiceWorkerRegistration::ActivateWaitingVersionWhenReady() {
   DCHECK(waiting_version());
   should_activate_when_ready_ = true;
-  if (!active_version() || !active_version()->HasControllee())
+  if (!active_version() || !active_version()->HasControllee()
+      || waiting_version()->skip_waiting())
     ActivateWaitingVersion();
 }
 
@@ -220,7 +221,7 @@ void ServiceWorkerRegistration::ActivateWaitingVersion() {
     return;  // Activation is no longer relevant.
   }
 
-  // "4. If exitingWorker is not null,
+  // "5. If exitingWorker is not null,
   if (exiting_version.get()) {
     DCHECK(!exiting_version->HasControllee());

[falken, 2014/11/27 03:40:40]

Can't this DCHECK fail in the skip waiting scenario?

[xiang, 2014/11/28 08:04:26]

Done.

     // TODO(michaeln): should wait for events to be complete
@@ -233,17 +234,18 @@ void ServiceWorkerRegistration::ActivateWaitingVersion() {
     exiting_version->SetStatus(ServiceWorkerVersion::REDUNDANT);
   }
 
-  // "5. Set serviceWorkerRegistration.activeWorker to activatingWorker."
-  // "6. Set serviceWorkerRegistration.waitingWorker to null."
+  // "6. Set serviceWorkerRegistration.activeWorker to activatingWorker."
+  // "7. Set serviceWorkerRegistration.waitingWorker to null."
   SetActiveVersion(activating_version.get());
 
-  // "7. Run the [[UpdateState]] algorithm passing registration.activeWorker and
+  // "8. Run the [[UpdateState]] algorithm passing registration.activeWorker and
   // "activating" as arguments."
+  // "9. Fire a simple event named controllerchange..."

[falken, 2014/11/25 09:25:02]

It's not too clear how Step 9 is implemented, can you add a small comment about
that?

[xiang, 2014/11/28 08:04:26]

Done.

   activating_version->SetStatus(ServiceWorkerVersion::ACTIVATING);
+  if (activating_version->skip_waiting())
+    FOR_EACH_OBSERVER(Listener, listeners_, OnSkippedWaiting(this));
 
-  // TODO(nhiroki): "8. Fire a simple event named controllerchange..."
-
-  // "9. Queue a task to fire an event named activate..."
+  // "10. Queue a task to fire an event named activate..."
   activating_version->DispatchActivateEvent(
       base::Bind(&ServiceWorkerRegistration::OnActivateEventFinished,
                  this, activating_version));