ServiceWorker: Stop sending the SetVersionAttributes message from SWProviderHost

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 34 matching lines @@
     installing_version_->RemovePotentialControllee(this);
   if (associated_registration_.get())
     associated_registration_->RemoveListener(this);
 }
 
 void ServiceWorkerProviderHost::OnVersionAttributesChanged(
     ServiceWorkerRegistration* registration,
     ChangedVersionAttributesMask changed_mask,
     const ServiceWorkerRegistrationInfo& info) {
   DCHECK_EQ(associated_registration_.get(), registration);
-  SetVersionAttributes(registration->installing_version(),
-                       registration->waiting_version(),
-                       registration->active_version());
+  UpdatePotentialControllees(registration->installing_version(),
+                             registration->waiting_version(),
+                             registration->active_version());
 }
 
 void ServiceWorkerProviderHost::OnRegistrationFailed(
     ServiceWorkerRegistration* registration) {
   DCHECK_EQ(associated_registration_.get(), registration);
   UnassociateRegistration();
 }
 
 void ServiceWorkerProviderHost::SetDocumentUrl(const GURL& url) {
   DCHECK(!url.has_ref());
   document_url_ = url;
 }
 
-void ServiceWorkerProviderHost::SetVersionAttributes(
+void ServiceWorkerProviderHost::UpdatePotentialControllees(
     ServiceWorkerVersion* installing_version,
     ServiceWorkerVersion* waiting_version,
     ServiceWorkerVersion* active_version) {
-  ChangedVersionAttributesMask mask;
+   if (installing_version != installing_version_.get()) {
+     scoped_refptr<ServiceWorkerVersion> previous_version = installing_version_;
+     if (previous_version)
+       previous_version->RemovePotentialControllee(this);
+     if (installing_version)
+       installing_version->AddPotentialControllee(this);
+     installing_version_ = installing_version;
+   }
 
-  if (installing_version != installing_version_.get()) {
-    SetVersionAttributesInternal(installing_version, &installing_version_);
-    mask.add(ChangedVersionAttributesMask::INSTALLING_VERSION);
-  }
-  if (waiting_version != waiting_version_.get()) {
-    SetVersionAttributesInternal(waiting_version, &waiting_version_);
-    mask.add(ChangedVersionAttributesMask::WAITING_VERSION);
-  }
-  if (active_version != active_version_.get()) {
-    SetVersionAttributesInternal(active_version, &active_version_);
-    mask.add(ChangedVersionAttributesMask::ACTIVE_VERSION);
-  }
+   if (waiting_version != waiting_version_.get()) {
+     scoped_refptr<ServiceWorkerVersion> previous_version = waiting_version_;
+     if (previous_version)
+       previous_version->RemovePotentialControllee(this);
+     if (waiting_version)
+       waiting_version->AddPotentialControllee(this);
+     waiting_version_ = waiting_version;
+   }
 
-  if (!dispatcher_host_)
-    return;  // Could be NULL in some tests.
-  if (!mask.changed())
-    return;
-
-  ServiceWorkerVersionAttributes attributes;
-  if (mask.installing_changed())
-    attributes.installing = CreateHandleAndPass(installing_version);
-  if (mask.waiting_changed())
-    attributes.waiting = CreateHandleAndPass(waiting_version);
-  if (mask.active_changed())
-    attributes.active = CreateHandleAndPass(active_version);
-
-  dispatcher_host_->Send(new ServiceWorkerMsg_SetVersionAttributes(
-      kDocumentMainThreadId,
-      provider_id(),
-      kInvalidServiceWorkerRegistrationHandleId,
-      mask.changed(),
-      attributes));
-}
-
-void ServiceWorkerProviderHost::SetVersionAttributesInternal(
-    ServiceWorkerVersion* version,
-    scoped_refptr<ServiceWorkerVersion>* data_member) {
-  scoped_refptr<ServiceWorkerVersion> previous_version = *data_member;
-  *data_member = version;
-  if (version)
-    version->AddPotentialControllee(this);
-  if (previous_version.get())
-    previous_version->RemovePotentialControllee(this);
+   if (active_version != active_version_.get()) {
+     scoped_refptr<ServiceWorkerVersion> previous_version = active_version_;
+     if (previous_version)
+       previous_version->RemovePotentialControllee(this);
+     if (active_version)
+       active_version->AddPotentialControllee(this);
+     active_version_ = active_version;
+   }
 }
 
 void ServiceWorkerProviderHost::SetControllerVersionAttribute(
     ServiceWorkerVersion* version) {
   if (version == controlling_version_.get())
     return;
 
   scoped_refptr<ServiceWorkerVersion> previous_version = controlling_version_;
   controlling_version_ = version;
   if (version)
     version->AddControllee(this);
   if (previous_version.get())
     previous_version->RemoveControllee(this);
 
   if (!dispatcher_host_)
     return;  // Could be NULL in some tests.
 
   dispatcher_host_->Send(new ServiceWorkerMsg_SetControllerServiceWorker(
       kDocumentMainThreadId, provider_id(), CreateHandleAndPass(version)));
 }
 
-void ServiceWorkerProviderHost::ClearVersionAttributes() {
-  SetVersionAttributes(NULL, NULL, NULL);
-  SetControllerVersionAttribute(NULL);
-}
-
 bool ServiceWorkerProviderHost::SetHostedVersionId(int64 version_id) {
   if (!context_)
     return true;  // System is shutting down.
   if (active_version_.get())
     return false;  // Unexpected bad message.
 
   ServiceWorkerVersion* live_version = context_->GetLiveVersion(version_id);
   if (!live_version)
     return true;  // Was deleted before it got started.
 
   ServiceWorkerVersionInfo info = live_version->GetInfo();
   if (info.running_status != ServiceWorkerVersion::STARTING ||
       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::AssociateRegistration(
     ServiceWorkerRegistration* registration) {
   DCHECK(CanAssociateRegistration(registration));
   associated_registration_ = registration;
   registration->AddListener(this);
-  SetVersionAttributes(registration->installing_version(),
-                       registration->waiting_version(),
-                       registration->active_version());
+  UpdatePotentialControllees(registration->installing_version(),
+                             registration->waiting_version(),
+                             registration->active_version());
   SetControllerVersionAttribute(registration->active_version());
 }
 
 void ServiceWorkerProviderHost::UnassociateRegistration() {
   if (!associated_registration_.get())
     return;
   associated_registration_->RemoveListener(this);
   associated_registration_ = NULL;
-  ClearVersionAttributes();
+  UpdatePotentialControllees(NULL, NULL, NULL);
+  SetControllerVersionAttribute(NULL);
 }
 
 scoped_ptr<ServiceWorkerRequestHandler>
 ServiceWorkerProviderHost::CreateRequestHandler(
     ResourceType resource_type,
     base::WeakPtr<storage::BlobStorageContext> blob_storage_context,
     scoped_refptr<ResourceRequestBody> body) {
   if (IsHostToRunningServiceWorker()) {
     return scoped_ptr<ServiceWorkerRequestHandler>(
         new ServiceWorkerContextRequestHandler(
@@ skipping 52 matching lines @@
     dispatcher_host_->RegisterServiceWorkerHandle(handle.Pass());
   }
   return info;
 }
 
 bool ServiceWorkerProviderHost::IsContextAlive() {
   return context_ != NULL;
 }
 
 }  // namespace content