ServiceWorker: Support navigator.serviceWorker.active

content/child/service_worker/service_worker_provider_context.cc

 // Copyright 2014 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/child/service_worker/service_worker_provider_context.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/stl_util.h"
 #include "content/child/child_thread.h"
@@ skipping 28 matching lines @@
 ServiceWorkerHandleReference* ServiceWorkerProviderContext::installing() {
   DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
   return installing_.get();
 }
 
 ServiceWorkerHandleReference* ServiceWorkerProviderContext::waiting() {
   DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
   return waiting_.get();
 }
 
+ServiceWorkerHandleReference* ServiceWorkerProviderContext::active() {
+  DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
+  return active_.get();
+}
+
 ServiceWorkerHandleReference* ServiceWorkerProviderContext::controller() {
   DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
   return controller_.get();
 }
 
 void ServiceWorkerProviderContext::OnServiceWorkerStateChanged(
     int handle_id,
     blink::WebServiceWorkerState state) {
   ServiceWorkerHandleReference* which = NULL;
   if (handle_id == controller_handle_id()) {
     which = controller_.get();
+  } else if (handle_id == active_handle_id()) {
+    which = active_.get();

[michaeln, 2014/07/09 02:07:05]

style nit: these one line blocks don't need {}'s

[nhiroki, 2014/07/09 06:14:27]

Done.

   } else if (handle_id == waiting_handle_id()) {
     which = waiting_.get();
   } else if (handle_id == installing_handle_id()) {
     which = installing_.get();
   }
 
   // We should only get messages for ServiceWorkers associated with
   // this provider.
   DCHECK(which);
 
@@ skipping 10 matching lines @@
   installing_ = ServiceWorkerHandleReference::Adopt(info, thread_safe_sender_);
 }
 
 void ServiceWorkerProviderContext::OnSetWaitingServiceWorker(
     int provider_id,
     const ServiceWorkerObjectInfo& info) {
   DCHECK_EQ(provider_id_, provider_id);
   waiting_ = ServiceWorkerHandleReference::Adopt(info, thread_safe_sender_);
 }
 
+void ServiceWorkerProviderContext::OnSetActiveServiceWorker(
+    int provider_id,
+    const ServiceWorkerObjectInfo& info) {
+  DCHECK_EQ(provider_id_, provider_id);
+  active_ = ServiceWorkerHandleReference::Adopt(info, thread_safe_sender_);
+}
+
 void ServiceWorkerProviderContext::OnSetControllerServiceWorker(
     int provider_id,
     const ServiceWorkerObjectInfo& info) {
   DCHECK_EQ(provider_id_, provider_id);
 
   // This context is is the primary owner of this handle, keeps the
   // initial reference until it goes away.
   controller_ = ServiceWorkerHandleReference::Adopt(info, thread_safe_sender_);
 
   // TODO(kinuko): We can forward the message to other threads here
   // when we support navigator.serviceWorker in dedicated workers.
 }
 
 int ServiceWorkerProviderContext::installing_handle_id() const {
   DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
   return installing_ ? installing_->info().handle_id
                      : kInvalidServiceWorkerHandleId;
 }
 
 int ServiceWorkerProviderContext::waiting_handle_id() const {
   DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
   return waiting_ ? waiting_->info().handle_id
                   : kInvalidServiceWorkerHandleId;
 }
 
+int ServiceWorkerProviderContext::active_handle_id() const {
+  DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
+  return active_ ? active_->info().handle_id
+                 : kInvalidServiceWorkerHandleId;
+}
+
 int ServiceWorkerProviderContext::controller_handle_id() const {
   DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
   return controller_ ? controller_->info().handle_id
                      : kInvalidServiceWorkerHandleId;
 }
 
 }  // namespace content