ServiceWorker: Make SWProviderHost listen to SWRegistration

content/browser/service_worker/service_worker_provider_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_provider_host.h"
 
 #include "base/stl_util.h"
 #include "content/browser/message_port_message_filter.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_context_request_handler.h"
@@ skipping 23 matching lines @@
   // won't associate the new version with a provider being destroyed.
   document_url_ = GURL();
   if (controlling_version_)
     controlling_version_->RemoveControllee(this);
   if (active_version_)
     active_version_->RemovePotentialControllee(this);
   if (waiting_version_)
     waiting_version_->RemovePotentialControllee(this);
   if (installing_version_)
     installing_version_->RemovePotentialControllee(this);
+  if (associated_registration_)
+    associated_registration_->RemoveListener(this);
+}
+
+void ServiceWorkerProviderHost::OnVersionAttributesChanged(
+    ServiceWorkerRegistration* registration,
+    ChangedVersionAttributesMask changed_mask,
+    const ServiceWorkerRegistrationInfo& info) {
+  if (changed_mask.installing_changed())
+    SetInstallingVersion(registration->installing_version());
+  if (changed_mask.waiting_changed())
+    SetWaitingVersion(registration->waiting_version());
+  if (changed_mask.active_changed())
+    SetActiveVersion(registration->active_version());
+}
+
+void ServiceWorkerProviderHost::OnRegistrationDeleted(
+    ServiceWorkerRegistration* registration) {
+  DCHECK(associated_registration_);
+  DCHECK_EQ(registration->id(), associated_registration_->id());
+  associated_registration_->RemoveListener(this);
+  associated_registration_ = NULL;
 }
 
 void ServiceWorkerProviderHost::SetDocumentUrl(const GURL& url) {
   DCHECK(!url.has_ref());
   document_url_ = url;
 }
 
 void ServiceWorkerProviderHost::SetControllerVersion(
     ServiceWorkerVersion* version) {
   DCHECK(CanAssociateVersion(version));
@@ skipping 98 matching lines @@
       info.process_id != process_id_) {
     // If we aren't trying to start this version in our process
     // something is amiss.
     return false;
   }
 
   running_hosted_version_ = live_version;
   return true;
 }
 
+void ServiceWorkerProviderHost::SetRegistration(
+    ServiceWorkerRegistration* registration) {
+  DCHECK(CanAssociateRegistration(registration));
+  if (associated_registration_)
+    associated_registration_->RemoveListener(this);
+  associated_registration_ = registration;
+
+  if (!registration) {
+    SetActiveVersion(NULL);
+    SetInstallingVersion(NULL);
+    SetWaitingVersion(NULL);
+    return;
+  }
+
+  registration->AddListener(this);
+  SetActiveVersion(registration->active_version());
+  SetInstallingVersion(registration->installing_version());
+  SetWaitingVersion(registration->waiting_version());
+}
+
 scoped_ptr<ServiceWorkerRequestHandler>
 ServiceWorkerProviderHost::CreateRequestHandler(
     ResourceType resource_type,
     base::WeakPtr<webkit_blob::BlobStorageContext> blob_storage_context) {
   if (IsHostToRunningServiceWorker()) {
     return scoped_ptr<ServiceWorkerRequestHandler>(
         new ServiceWorkerContextRequestHandler(
             context_, AsWeakPtr(), blob_storage_context, resource_type));
   }
   if (ServiceWorkerUtils::IsMainResourceType(resource_type) ||
       active_version()) {
     return scoped_ptr<ServiceWorkerRequestHandler>(
         new ServiceWorkerControlleeRequestHandler(
             context_, AsWeakPtr(), blob_storage_context, resource_type));
   }
   return scoped_ptr<ServiceWorkerRequestHandler>();
 }
 
 bool ServiceWorkerProviderHost::CanAssociateVersion(

[michaeln, 2014/08/07 01:34:35]

i think this check gets simplified to version->registration_id() ==
associated_reg_->id()

[nhiroki, 2014/08/07 02:57:27]

Acknowledged. I'll make a separate CL for this clean up.

     ServiceWorkerVersion* version) {
   if (!context_)
     return false;
   if (running_hosted_version_)
     return false;
   if (!version)
     return true;
 
   ServiceWorkerVersion* already_associated_version = NULL;
   if (controlling_version_)
     already_associated_version = controlling_version_;
   if (active_version_)
     already_associated_version = active_version_;
   else if (waiting_version_)
     already_associated_version = waiting_version_;
   else if (installing_version_)
     already_associated_version = installing_version_;
 
   return !already_associated_version ||
          already_associated_version->registration_id() ==
               version->registration_id();
 }
 
+bool ServiceWorkerProviderHost::CanAssociateRegistration(
+    ServiceWorkerRegistration* registration) {
+  if (!context_)
+    return false;

[michaeln, 2014/08/07 01:34:35]

also if (running_hosted_version_) return false;

[nhiroki, 2014/08/07 02:57:27]

Done.

+  if (!registration)

[michaeln, 2014/08/07 01:34:35]

seems like NULL should not be valid inputs to this method?

[nhiroki, 2014/08/07 02:57:27]

Done.

+    return true;
+  if (associated_registration_)
+    return false;
+  return true;
+}
+
 void ServiceWorkerProviderHost::PostMessage(
     const base::string16& message,
     const std::vector<int>& sent_message_port_ids) {
   if (!dispatcher_host_)
     return;  // Could be NULL in some tests.
 
   std::vector<int> new_routing_ids;
   dispatcher_host_->message_port_message_filter()->
       UpdateMessagePortsWithNewRoutes(sent_message_port_ids,
                                       &new_routing_ids);
@@ skipping 17 matching lines @@
     dispatcher_host_->RegisterServiceWorkerHandle(handle.Pass());
   }
   return info;
 }
 
 bool ServiceWorkerProviderHost::IsContextAlive() {
   return context_ != NULL;
 }
 
 }  // namespace content