ServiceWorker: Update the install sequence as per the latest spec

content/browser/service_worker/service_worker_dispatcher_host.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/service_worker_dispatcher_host.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/message_port_message_filter.h"
 #include "content/browser/message_port_service.h"
@@ skipping 358 matching lines @@
       FindRegistrationHandle(provider_id, registration_id);
   ServiceWorkerRegistrationObjectInfo info;
   if (handle) {
     handle->IncrementRefCount();
     info = handle->GetObjectInfo();
   } else {
     scoped_ptr<ServiceWorkerRegistrationHandle> new_handle(
         new ServiceWorkerRegistrationHandle(
             GetContext()->AsWeakPtr(), this, provider_id, registration));
     info = new_handle->GetObjectInfo();
+    handle = new_handle.get();
     RegisterServiceWorkerRegistrationHandle(new_handle.Pass());
   }
 
+  ChangedVersionAttributesMask mask;

[michaeln, 2014/08/29 00:57:57]

the 'change mask' seems out of place here? what's changed? these structs are not
reflecting a change in state, just the state as it is at this point in time.

[nhiroki, 2014/08/29 08:23:10]

That makes sense. Removed the mask and made the dispatcher send only attributes.

+  ServiceWorkerVersionAttributes attrs;
+
+  if (registration->installing_version()) {
+    mask.add(ChangedVersionAttributesMask::INSTALLING_VERSION);
+    attrs.installing = handle->CreateServiceWorkerHandleAndPass(
+        registration->installing_version());
+  }
+  if (registration->waiting_version()) {
+    mask.add(ChangedVersionAttributesMask::WAITING_VERSION);
+    attrs.waiting = handle->CreateServiceWorkerHandleAndPass(
+        registration->waiting_version());
+  }
+  if (registration->active_version()) {
+    mask.add(ChangedVersionAttributesMask::ACTIVE_VERSION);
+    attrs.active = handle->CreateServiceWorkerHandleAndPass(
+        registration->active_version());
+  }
+  attrs.changed_mask = mask.changed();
+
   Send(new ServiceWorkerMsg_ServiceWorkerRegistered(
-      thread_id, request_id, info));
+      thread_id, request_id, info, attrs));
 }
 
 void ServiceWorkerDispatcherHost::OnWorkerReadyForInspection(
     int embedded_worker_id) {
   if (!GetContext())
     return;
   EmbeddedWorkerRegistry* registry = GetContext()->embedded_worker_registry();
   if (!registry->CanHandle(embedded_worker_id))
     return;
   registry->OnWorkerReadyForInspection(render_process_id_, embedded_worker_id);
@@ skipping 149 matching lines @@
       status, &error_type, &error_message);
   Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
       thread_id, request_id, error_type, error_message));
 }
 
 ServiceWorkerContextCore* ServiceWorkerDispatcherHost::GetContext() {
   return context_wrapper_->context();
 }
 
 }  // namespace content