ServiceWorker: add ServiceWorkerClients.claim() support (2/3).

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 71 matching lines @@
 void ServiceWorkerProviderHost::OnSkippedWaiting(
     ServiceWorkerRegistration* registration) {
   DCHECK_EQ(associated_registration_.get(), registration);
   // A client is "using" a registration if it is controlled by the active
   // worker of the registration. skipWaiting doesn't cause a client to start
   // using the registration.
   if (!controlling_version_)
     return;
   ServiceWorkerVersion* active_version = registration->active_version();
   DCHECK_EQ(active_version->status(), ServiceWorkerVersion::ACTIVATING);
-  SetControllerVersionAttribute(active_version);
+  SetControllerVersionAttribute(active_version, true);

[falken, 2015/01/26 08:45:13]

nit: can you add /* should_notify_controller_change */ next to true, or use a
const boolean.

[xiang, 2015/01/28 05:38:35]

Done.

 }
 
 void ServiceWorkerProviderHost::SetDocumentUrl(const GURL& url) {
   DCHECK(!url.has_ref());
   document_url_ = url;
 }
 
 void ServiceWorkerProviderHost::SetTopmostFrameUrl(const GURL& url) {
   topmost_frame_url_ = url;
 }
 
 void ServiceWorkerProviderHost::SetControllerVersionAttribute(
-    ServiceWorkerVersion* version) {
+    ServiceWorkerVersion* version,
+    bool should_notify_controllerchange) {
   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.
 
-  bool should_notify_controllerchange =
-      previous_version && version && version->skip_waiting();
-
   dispatcher_host_->Send(new ServiceWorkerMsg_SetControllerServiceWorker(
       kDocumentMainThreadId, provider_id(),
       dispatcher_host_->CreateAndRegisterServiceWorkerHandle(version),
       should_notify_controllerchange));
 }
 
 bool ServiceWorkerProviderHost::SetHostedVersionId(int64 version_id) {
   if (!context_)
     return true;  // System is shutting down.
   if (active_version())
     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 != render_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) {
+    ServiceWorkerRegistration* registration,
+    bool should_notify_controllerchange) {
   DCHECK(CanAssociateRegistration(registration));
-  if (associated_registration_.get())
-    DecreaseProcessReference(associated_registration_->pattern());
   IncreaseProcessReference(registration->pattern());
 
   associated_registration_ = registration;
   associated_registration_->AddListener(this);
   SendAssociateRegistrationMessage();
-  SetControllerVersionAttribute(registration->active_version());
+  SetControllerVersionAttribute(registration->active_version(),
+                                should_notify_controllerchange);
 }
 
 void ServiceWorkerProviderHost::DisassociateRegistration() {
   if (!associated_registration_.get())
     return;
   DecreaseProcessReference(associated_registration_->pattern());
   associated_registration_->RemoveListener(this);
   associated_registration_ = NULL;
-  SetControllerVersionAttribute(NULL);
+  SetControllerVersionAttribute(NULL, false);
 
   if (dispatcher_host_) {
     dispatcher_host_->Send(new ServiceWorkerMsg_DisassociateRegistration(
         kDocumentMainThreadId, provider_id()));
   }
 }
 
 scoped_ptr<ServiceWorkerRequestHandler>
 ServiceWorkerProviderHost::CreateRequestHandler(
     FetchRequestMode request_mode,
@@ skipping 63 matching lines @@
                  callback));
 }
 
 void ServiceWorkerProviderHost::GetClientInfo(
     int embedded_worker_id,
     int request_id) {
   dispatcher_host_->Send(new ServiceWorkerMsg_GetClientInfo(
       kDocumentMainThreadId, embedded_worker_id, request_id, provider_id()));
 }
 
+void ServiceWorkerProviderHost::SetController(
+    ServiceWorkerRegistration* registration) {
+  DCHECK(registration->active_version());
+  if (associated_registration_ == registration) {

[falken, 2015/01/26 08:45:12]

when does this happen? if this provider host is associated with the
registration, wouldn't we get notification when the active version changes?

[xiang, 2015/01/28 05:38:35]

This could happen when a registration associated this provider host when
"registering" itself and later the claims clients.

[falken, 2015/01/28 08:59:49]

I see, I was confused and thought SWProviderHost listens for attribute changes
in SWRegistration. It used to do this, but no longer does. The comment for
AssociateRegistration() should be changed.

+    SetControllerVersionAttribute(registration->active_version(), true);
+    return;
+  }
+  DisassociateRegistration();
+  AssociateRegistration(registration, true);

[falken, 2015/01/26 08:45:12]

/* should_notify_controller_change */

[xiang, 2015/01/28 05:38:35]

Done. We don't need the flags now.

+}
+
 void ServiceWorkerProviderHost::AddScopedProcessReferenceToPattern(
     const GURL& pattern) {
   associated_patterns_.push_back(pattern);
   IncreaseProcessReference(pattern);
 }
 
 void ServiceWorkerProviderHost::PrepareForCrossSiteTransfer() {
   DCHECK_NE(ChildProcessHost::kInvalidUniqueID, render_process_id_);
 
   for (const GURL& pattern : associated_patterns_)
@@ skipping 76 matching lines @@
     context_->process_manager()->RemoveProcessReferenceFromPattern(
         pattern, render_process_id_);
   }
 }
 
 bool ServiceWorkerProviderHost::IsContextAlive() {
   return context_ != NULL;
 }
 
 }  // namespace content