ServiceWorker: Expose registration within ServiceWorkerGlobalScope [2/3]

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 13 matching lines @@
     return;  // May be null in some tests.
   thread_safe_sender_ = ChildThread::current()->thread_safe_sender();
   ServiceWorkerDispatcher* dispatcher =
       ServiceWorkerDispatcher::GetOrCreateThreadSpecificInstance(
           thread_safe_sender_.get());
   DCHECK(dispatcher);
   dispatcher->AddProviderContext(this);
 }
 
 ServiceWorkerProviderContext::~ServiceWorkerProviderContext() {
+  DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
   if (ServiceWorkerDispatcher* dispatcher =
           ServiceWorkerDispatcher::GetThreadSpecificInstance()) {
+    // Remove this context from the dispatcher living on the main thread.
     dispatcher->RemoveProviderContext(this);
   }
 }
 
 ServiceWorkerHandleReference* ServiceWorkerProviderContext::controller() {
   DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
   return controller_.get();
 }
 
 ServiceWorkerRegistrationHandleReference*
 ServiceWorkerProviderContext::registration() {
-  DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
+  base::AutoLock lock(lock_);
   return registration_.get();
 }
 
 ServiceWorkerVersionAttributes
 ServiceWorkerProviderContext::GetVersionAttributes() {
+  base::AutoLock lock(lock_);
+  DCHECK(registration_);
+
   ServiceWorkerVersionAttributes attrs;
   if (installing_)
     attrs.installing = installing_->info();
   if (waiting_)
     attrs.waiting = waiting_->info();
   if (active_)
     attrs.active = active_->info();
   return attrs;
 }
 
 void ServiceWorkerProviderContext::SetVersionAttributes(
     ChangedVersionAttributesMask mask,
     const ServiceWorkerVersionAttributes& attrs) {
+  base::AutoLock lock(lock_);
   DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
   DCHECK(registration_);
 
   if (mask.installing_changed()) {
     installing_ = ServiceWorkerHandleReference::Adopt(
         attrs.installing, thread_safe_sender_.get());
   }
   if (mask.waiting_changed()) {
     waiting_ = ServiceWorkerHandleReference::Adopt(
         attrs.waiting, thread_safe_sender_.get());
   }
   if (mask.active_changed()) {
     active_ = ServiceWorkerHandleReference::Adopt(
         attrs.active, thread_safe_sender_.get());
   }
 }
 
 void ServiceWorkerProviderContext::OnAssociateRegistration(
     const ServiceWorkerRegistrationObjectInfo& info,
     const ServiceWorkerVersionAttributes& attrs) {
+  base::AutoLock lock(lock_);
   DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
   DCHECK(!registration_);
   DCHECK_NE(kInvalidServiceWorkerRegistrationId, info.registration_id);
   DCHECK_NE(kInvalidServiceWorkerRegistrationHandleId, info.handle_id);
 
   registration_ = ServiceWorkerRegistrationHandleReference::Adopt(
       info, thread_safe_sender_.get());
   installing_ = ServiceWorkerHandleReference::Adopt(
       attrs.installing, thread_safe_sender_.get());
   waiting_ = ServiceWorkerHandleReference::Adopt(
       attrs.waiting, thread_safe_sender_.get());
   active_ = ServiceWorkerHandleReference::Adopt(
       attrs.active, thread_safe_sender_.get());
 }
 
 void ServiceWorkerProviderContext::OnDisassociateRegistration() {
+  base::AutoLock lock(lock_);
   DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
+
   controller_.reset();
   active_.reset();
   waiting_.reset();
   installing_.reset();
   registration_.reset();
 }
 
 void ServiceWorkerProviderContext::OnServiceWorkerStateChanged(
     int handle_id,
     blink::WebServiceWorkerState state) {
+  base::AutoLock lock(lock_);
   DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
 
   ServiceWorkerHandleReference* which = NULL;
   if (handle_id == controller_handle_id())
     which = controller_.get();
   else if (handle_id == active_handle_id())
     which = active_.get();
   else if (handle_id == waiting_handle_id())
     which = waiting_.get();
   else if (handle_id == installing_handle_id())
@@ skipping 46 matching lines @@
   return controller_ ? controller_->info().handle_id
                      : kInvalidServiceWorkerHandleId;
 }
 
 int ServiceWorkerProviderContext::registration_handle_id() const {
   DCHECK(main_thread_loop_proxy_->RunsTasksOnCurrentThread());
   return registration_ ? registration_->info().handle_id
                        : kInvalidServiceWorkerRegistrationHandleId;
 }
 
+void ServiceWorkerProviderContext::DestructOnMainThread() const {
+  if (!main_thread_loop_proxy_->RunsTasksOnCurrentThread())
+    main_thread_loop_proxy_->DeleteSoon(FROM_HERE, this);
+}
+
 }  // namespace content