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

content/browser/service_worker/service_worker_storage.h

 // 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.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_STORAGE_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_STORAGE_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 69 matching lines @@
   // (the callback may be called prior to the method returning) or
   // asynchronously.
   void FindRegistrationForDocument(const GURL& document_url,
                                    const FindRegistrationCallback& callback);
   void FindRegistrationForPattern(const GURL& scope,
                                   const FindRegistrationCallback& callback);
   void FindRegistrationForId(int64 registration_id,
                              const GURL& origin,
                              const FindRegistrationCallback& callback);
 
+  scoped_refptr<ServiceWorkerRegistration> GetUninstallingRegistration(

[michaeln, 2014/08/12 02:15:36]

nit: can this be a rawptr so there's that much less refcount churn in the world

[falken, 2014/08/12 09:06:06]

Ah of course. Done.

+      const GURL& scope);
+
   // Returns info about all stored and initially installing registrations.
   void GetAllRegistrations(const GetAllRegistrationInfosCallback& callback);
 
   // Commits |registration| with the installed but not activated |version|
   // to storage, overwritting any pre-existing registration data for the scope.
   // A pre-existing version's script resources remain available if that version
   // is live. PurgeResources should be called when it's OK to delete them.
   void StoreRegistration(
       ServiceWorkerRegistration* registration,
       ServiceWorkerVersion* version,
@@ skipping 36 matching lines @@
   int64 NewVersionId();
   int64 NewResourceId();
 
   // Intended for use only by ServiceWorkerRegisterJob.
   void NotifyInstallingRegistration(
       ServiceWorkerRegistration* registration);
   void NotifyDoneInstallingRegistration(
       ServiceWorkerRegistration* registration,
       ServiceWorkerVersion* version,
       ServiceWorkerStatusCode status);
+  // Intended for use only by ServiceWorkerRegistration.
+  void NotifyUninstallingRegistration(ServiceWorkerRegistration* registration);
+  void NotifyAbortedUninstallingRegistration(
+      ServiceWorkerRegistration* registration);
+  void NotifyUninstalledRegistration(ServiceWorkerRegistration* registration);

[michaeln, 2014/08/12 02:15:36]

for consistency, can this be NotifyDoneXxxxx

[falken, 2014/08/12 09:06:06]

Done.

 
   void Disable();
   bool IsDisabled() const;
 
   // |resources| must already be on the purgeable list.
   void PurgeResources(const ResourceList& resources);
 
  private:
   friend class ServiceWorkerResourceStorageTest;
   friend class ServiceWorkerControlleeRequestHandlerTest;
@@ skipping 85 matching lines @@
       ServiceWorkerDatabase::Status status);
   void DidGetAllRegistrations(
       const GetAllRegistrationInfosCallback& callback,
       RegistrationList* registrations,
       ServiceWorkerDatabase::Status status);
   void DidStoreRegistration(const StatusCallback& callback,
                             const GURL& origin,
                             int64 deleted_version_id,
                             const std::vector<int64>& newly_purgeable_resources,
                             ServiceWorkerDatabase::Status status);
+  void DidRestoreRegistration(int64 registration_id,
+                              ServiceWorkerStatusCode status);
+
   void DidUpdateToActiveState(
       const StatusCallback& callback,
       ServiceWorkerDatabase::Status status);
   void DidDeleteRegistration(
       const DidDeleteRegistrationParams& params,
       bool origin_is_deletable,
       int64 version_id,
       const std::vector<int64>& newly_purgeable_resources,
       ServiceWorkerDatabase::Status status);
   void ReturnFoundRegistration(
@@ skipping 67 matching lines @@
       const FindInDBCallback& callback);
 
   void ScheduleDeleteAndStartOver();
   void DidDeleteDatabase(
       const StatusCallback& callback,
       ServiceWorkerDatabase::Status status);
   void DidDeleteDiskCache(
       const StatusCallback& callback,
       bool result);
 
-  // For finding registrations being installed.
+  // For finding registrations being installed or uninstalled.
   RegistrationRefsById installing_registrations_;
+  RegistrationRefsById uninstalling_registrations_;
 
   // Origins having registations.
   std::set<GURL> registered_origins_;
 
   // Pending database tasks waiting for initialization.
   std::vector<base::Closure> pending_tasks_;
 
   int64 next_registration_id_;
   int64 next_version_id_;
   int64 next_resource_id_;
@@ skipping 22 matching lines @@
   std::set<int64> pending_deletions_;
 
   base::WeakPtrFactory<ServiceWorkerStorage> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerStorage);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_STORAGE_H_