Service Worker: in Unregister, wait until after the active worker no longer controls a document

content/browser/service_worker/service_worker_registration.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_registration.h"
 
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_info.h"
 #include "content/browser/service_worker/service_worker_register_job.h"
 #include "content/browser/service_worker/service_worker_utils.h"
@@ skipping 12 matching lines @@
 }  // namespace
 
 ServiceWorkerRegistration::ServiceWorkerRegistration(
     const GURL& pattern,
     const GURL& script_url,
     int64 registration_id,
     base::WeakPtr<ServiceWorkerContextCore> context)
     : pattern_(pattern),
       script_url_(script_url),
       registration_id_(registration_id),
+      is_uninstalling_(false),
       context_(context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(context_);
   context_->AddLiveRegistration(this);
 }
 
 ServiceWorkerRegistration::~ServiceWorkerRegistration() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (context_)
     context_->RemoveLiveRegistration(registration_id_);
@@ skipping 41 matching lines @@
     return;
   ChangedVersionAttributesMask mask;
   UnsetVersionInternal(version, &mask);
   if (mask.changed()) {
     ServiceWorkerRegistrationInfo info = GetInfo();
     FOR_EACH_OBSERVER(Listener, listeners_,
                       OnVersionAttributesChanged(this, mask, info));
   }
 }
 
+void ServiceWorkerRegistration::OnNoControllees(ServiceWorkerVersion* version) {

[michaeln, 2014/07/29 03:33:39]

our CL's collide on this method :( 

so we'll have to 'coagulate' these changes, i've hit the CQ on mine but it may
bounce (ya never know).

+  DCHECK_EQ(active_version(), version);
+  version->RemoveListener(this);
+  if (!is_uninstalling())
+    return;
+  Clear();
+}
+
 void ServiceWorkerRegistration::SetVersionInternal(
     ServiceWorkerVersion* version,
     scoped_refptr<ServiceWorkerVersion>* data_member,
     int change_flag) {
   if (version == data_member->get())
     return;
   scoped_refptr<ServiceWorkerVersion> protect(version);
   ChangedVersionAttributesMask mask;
   if (version)
     UnsetVersionInternal(version, &mask);
@@ skipping 53 matching lines @@
   activating_version->SetStatus(ServiceWorkerVersion::ACTIVATING);
 
   // TODO(nhiroki): "8. Fire a simple event named controllerchange..."
 
   // "9. Queue a task to fire an event named activate..."
   activating_version->DispatchActivateEvent(
       base::Bind(&ServiceWorkerRegistration::OnActivateEventFinished,
                  this, activating_version, completion_callback));
 }
 
+void ServiceWorkerRegistration::ClearWhenReady() {
+  DCHECK(context_);
+  if (is_uninstalling())
+    return;
+  is_uninstalling_ = true;
+  context_->storage()->NotifyUninstallingRegistration(this);
+
+  // Delete from DB in case browser dies before we're ready.
+  context_->storage()->DeleteRegistration(
+      id(),
+      script_url().GetOrigin(),
+      base::Bind(&ServiceWorkerUtils::NoOpStatusCallback));
+
+  if (active_version() && active_version()->HasControllee())
+    active_version()->AddListener(this);
+  else
+    Clear();
+}
+
+void ServiceWorkerRegistration::AbortPendingClear() {
+  DCHECK(context_);
+  if (!is_uninstalling())
+    return;
+  is_uninstalling_ = false;
+  context_->storage()->NotifyDoneUninstallingRegistration(this);
+
+  if (waiting_version()) {
+    context_->storage()->StoreRegistration(
+        this,
+        waiting_version(),
+        base::Bind(&ServiceWorkerUtils::NoOpStatusCallback));
+    return;
+  }
+  if (active_version()) {
+    context_->storage()->StoreRegistration(
+        this,
+        active_version(),
+        base::Bind(&ServiceWorkerUtils::NoOpStatusCallback));
+  }
+}
+
 void ServiceWorkerRegistration::OnActivateEventFinished(
     ServiceWorkerVersion* activating_version,
     const StatusCallback& completion_callback,
     ServiceWorkerStatusCode status) {
   if (activating_version != active_version())
     return;
   // TODO(kinuko,falken): For some error cases (e.g. ServiceWorker is
   // unexpectedly terminated) we may want to retry sending the event again.
   if (status != SERVICE_WORKER_OK) {
     // "11. If activateFailed is true, then:..."
@@ skipping 14 matching lines @@
   // and "activated" as the arguments."
   activating_version->SetStatus(ServiceWorkerVersion::ACTIVATED);
   if (context_) {
     context_->storage()->UpdateToActiveState(
         this,
         base::Bind(&ServiceWorkerUtils::NoOpStatusCallback));
   }
   completion_callback.Run(SERVICE_WORKER_OK);
 }
 
+void ServiceWorkerRegistration::Clear() {
+  DCHECK(is_uninstalling());
+  if (!context_)
+    return;
+
+  context_->storage()->NotifyDoneUninstallingRegistration(this);
+  if (installing_version()) {
+    installing_version()->Doom();
+    UnsetVersion(installing_version());
+  }
+
+  if (waiting_version()) {
+    waiting_version()->Doom();
+    UnsetVersion(waiting_version());
+  }
+
+  if (active_version()) {
+    active_version()->Doom();
+    UnsetVersion(active_version());
+  }
+}
+
 }  // namespace content