Creates CacheContext for ServiceWorkerCacheStorage

content/browser/service_worker/service_worker_cache_storage.h

 // 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.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CACHE_STORAGE_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CACHE_STORAGE_H_
 
 #include <map>
 #include <string>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/id_map.h"

[falken, 2014/08/26 06:31:33]

Can this id_map.h be removed?

[jkarlin, 2014/08/26 12:03:10]

Done.

 #include "base/memory/weak_ptr.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace net {
 class URLRequestContext;
 }
 
 namespace storage {
 class BlobStorageContext;
 }
 
 namespace content {
 class ServiceWorkerCache;
 
 // TODO(jkarlin): Constrain the total bytes used per origin.
 
 // ServiceWorkerCacheStorage holds the set of caches for a given origin. It is
 // owned by the ServiceWorkerCacheStorageManager. This class expects to be run
 // on the IO thread.
 class ServiceWorkerCacheStorage {
  public:
+  // TODO(jkarlin): Convert this (and everything that uses it) to int64_t so
+  // that we don't run out of id space.
+  typedef int32_t CacheID;
+
   enum CacheStorageError {
     CACHE_STORAGE_ERROR_NO_ERROR,
     CACHE_STORAGE_ERROR_NOT_IMPLEMENTED,
     CACHE_STORAGE_ERROR_NOT_FOUND,
     CACHE_STORAGE_ERROR_EXISTS,
     CACHE_STORAGE_ERROR_STORAGE,
     CACHE_STORAGE_ERROR_EMPTY_KEY,
+    CACHE_STORAGE_ERROR_CLOSING
   };
 
   typedef base::Callback<void(bool, CacheStorageError)> BoolAndErrorCallback;
   typedef base::Callback<void(int, CacheStorageError)> CacheAndErrorCallback;
   typedef base::Callback<void(const std::vector<std::string>&,
                               CacheStorageError)> StringsAndErrorCallback;
 
   ServiceWorkerCacheStorage(
       const base::FilePath& origin_path,
       bool memory_only,
@@ skipping 25 matching lines @@
 
   // Calls the callback with a vector of cache names (keys) available.
   void EnumerateCaches(const StringsAndErrorCallback& callback);
 
   // TODO(jkarlin): Add match() function.
 
  private:
   class MemoryLoader;
   class SimpleCacheLoader;
   class CacheLoader;
+  struct CacheContext;
 
-  typedef IDMap<ServiceWorkerCache, IDMapOwnPointer> CacheMap;
-  typedef CacheMap::KeyType CacheID;
+  typedef std::map<CacheID, CacheContext*> CacheMap;
   typedef std::map<std::string, CacheID> NameMap;
 
-  ServiceWorkerCache* GetLoadedCache(const std::string& cache_name) const;
+  CacheContext* GetLoadedCache(const std::string& cache_name) const;
 
   // Initializer and its callback are below.
   void LazyInit(const base::Closure& closure);
   void LazyInitDidLoadIndex(
       const base::Closure& callback,
       scoped_ptr<std::vector<std::string> > indexed_cache_names);
   void LazyInitIterateAndLoadCacheName(
       const base::Closure& callback,
       scoped_ptr<std::vector<std::string> > indexed_cache_names,
       const std::vector<std::string>::const_iterator& iter,
+      const std::string& cache_name,
       scoped_ptr<ServiceWorkerCache> cache);
   void LazyInitDone();
 
   void DidCreateBackend(base::WeakPtr<ServiceWorkerCache> cache,
+                        CacheID cache_id,
                         const CacheAndErrorCallback& callback,
                         bool success);
 
-  void AddCacheToMaps(scoped_ptr<ServiceWorkerCache> cache);
+  CacheContext* AddCacheToMaps(const std::string& cache_name,
+                               scoped_ptr<ServiceWorkerCache> cache);
 
   // The CreateCache callbacks are below.
   void CreateCacheDidCreateCache(const std::string& cache_name,
                                  const CacheAndErrorCallback& callback,
                                  scoped_ptr<ServiceWorkerCache> cache);
   void CreateCacheDidWriteIndex(const CacheAndErrorCallback& callback,
                                 base::WeakPtr<ServiceWorkerCache> cache,
+                                CacheID id,
                                 bool success);
 
   // The DeleteCache callbacks are below.
   void DeleteCacheDidWriteIndex(const std::string& cache_name,
                                 const BoolAndErrorCallback& callback,
                                 bool success);
   void DeleteCacheDidCleanUp(const BoolAndErrorCallback& callback,
                              bool success);
 
   // Whether or not we've loaded the list of cache names into memory.
   bool initialized_;
 
   // The list of operations waiting on initialization.
   std::vector<base::Closure> init_callbacks_;
 
-  // The map of ServiceWorkerCache objects to their integer ids that
-  // ServiceWorkers reference.  Owns the cache objects.
+  // The map of CacheIds to their CacheContext objects. Owns the CacheContext
+  // object. The CacheIDs are used by JavaScript to reference a

[falken, 2014/08/26 06:31:33]

nit: Be consistent about CacheID vs CacheId

[jkarlin, 2014/08/26 12:03:10]

Done.

+  // ServiceWorkerCache.
   CacheMap cache_map_;
+  CacheID next_cache_id_;  // The next CacheID to use in cache_map_;

[falken, 2014/08/26 06:31:33]

nit: no need to end comment with semicolon

[jkarlin, 2014/08/26 12:03:10]

Done.

 
   // The map of cache names to their integer ids.
   NameMap name_map_;
 
   // The file path for this CacheStorage.
   base::FilePath origin_path_;
 
   // The TaskRunner to run file IO on.
   scoped_refptr<base::SequencedTaskRunner> cache_task_runner_;
 
   // Performs backend specific operations (memory vs disk).
   scoped_refptr<CacheLoader> cache_loader_;
 
   base::WeakPtrFactory<ServiceWorkerCacheStorage> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerCacheStorage);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CACHE_STORAGE_H_