CacheStorage: Support multiple batch operations

content/browser/cache_storage/cache_storage_cache.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_CACHE_STORAGE_CACHE_STORAGE_CACHE_H_
 #define CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_CACHE_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 56 matching lines @@
       const GURL& origin,
       const base::FilePath& path,
       net::URLRequestContext* request_context,
       const scoped_refptr<storage::QuotaManagerProxy>& quota_manager_proxy,
       base::WeakPtr<storage::BlobStorageContext> blob_context);
 
   // Returns ERROR_TYPE_NOT_FOUND if not found.
   void Match(scoped_ptr<ServiceWorkerFetchRequest> request,
              const ResponseCallback& callback);
 
-  // Puts the request and response object in the cache. The response body (if
-  // present) is stored in the cache, but not the request body. Returns
-  // ERROR_TYPE_OK on success.
-  void Put(scoped_ptr<ServiceWorkerFetchRequest> request,
-           scoped_ptr<ServiceWorkerResponse> response,
-           const ErrorCallback& callback);
-
-  // Returns ErrorNotFound if not found. Otherwise deletes and returns
-  // ERROR_TYPE_OK.
-  void Delete(scoped_ptr<ServiceWorkerFetchRequest> request,
-              const ErrorCallback& callback);
+  // Runs given batch operations. This corresponds to the Batch Cache Operations
+  // algorithm in the spec.

[jkarlin, 2015/05/08 12:04:25]

Add a TODO and a corresponding crbug to make this function atomic.

[jkarlin, 2015/05/08 15:27:27]

Add a comment that operations can't be mixed. Describe what the function does a
bit more (rather than just pointing to spec). Describe what errors are returned
and when.

[nhiroki, 2015/05/11 07:35:04]

Done.

[nhiroki, 2015/05/11 07:35:04]

Done.

+  void BatchOperation(const std::vector<CacheStorageBatchOperation>& operations,
+                      const ErrorCallback& callback);
+  void BatchDidOperation(const base::Closure& barrier_closure,

[jkarlin, 2015/05/08 11:45:43]

nit: Suggest BatchDidOneOperation. I hope to change the matchall callback's name
similarly.

[nhiroki, 2015/05/11 07:35:04]

Done.

+                         ErrorCallback* callback,
+                         ErrorType error);
+  void BatchDidAllOperations(scoped_ptr<ErrorCallback> callback);
 
   // TODO(jkarlin): Have keys take an optional ServiceWorkerFetchRequest.
   // Returns ErrorTypeOK and a vector of requests if there are no errors.
   void Keys(const RequestsCallback& callback);
 
   // Closes the backend. Future operations that require the backend
   // will exit early. Close should only be called once per CacheStorageCache.
   void Close(const base::Closure& callback);
 
   // The size of the cache contents in memory. Returns 0 if the cache backend is
@@ skipping 35 matching lines @@
   // Match callbacks
   void MatchImpl(scoped_ptr<ServiceWorkerFetchRequest> request,
                  const ResponseCallback& callback);
   void MatchDidOpenEntry(scoped_ptr<MatchContext> match_context, int rv);
   void MatchDidReadMetadata(scoped_ptr<MatchContext> match_context,
                             scoped_ptr<CacheMetadata> headers);
   void MatchDidReadResponseBodyData(scoped_ptr<MatchContext> match_context,
                                     int rv);
   void MatchDoneWithBody(scoped_ptr<MatchContext> match_context);
 
-  // Put callbacks.
+  // Puts the request and response object in the cache. The response body (if
+  // present) is stored in the cache, but not the request body. Returns
+  // ERROR_TYPE_OK on success.
+  void Put(const CacheStorageBatchOperation& operation,
+           const ErrorCallback& callback);
   void PutImpl(scoped_ptr<PutContext> put_context);
   void PutDidDelete(scoped_ptr<PutContext> put_context, ErrorType delete_error);
   void PutDidCreateEntry(scoped_ptr<PutContext> put_context, int rv);
   void PutDidWriteHeaders(scoped_ptr<PutContext> put_context,
                           int expected_bytes,
                           int rv);
   void PutDidWriteBlobToCache(scoped_ptr<PutContext> put_context,
                               scoped_ptr<BlobReader> blob_reader,
                               disk_cache::ScopedEntryPtr entry,
                               bool success);
 
-  // Delete callbacks
+  // Returns ErrorNotFound if not found. Otherwise deletes and returns
+  // ERROR_TYPE_OK.
+  void Delete(const CacheStorageBatchOperation& operation,
+              const ErrorCallback& callback);
   void DeleteImpl(scoped_ptr<ServiceWorkerFetchRequest> request,
                   const ErrorCallback& callback);
   void DeleteDidOpenEntry(
       const GURL& origin,
       scoped_ptr<ServiceWorkerFetchRequest> request,
       const CacheStorageCache::ErrorCallback& callback,
       scoped_ptr<disk_cache::Entry*> entryptr,
       const scoped_refptr<storage::QuotaManagerProxy>& quota_manager_proxy,
       int rv);
 
@@ skipping 45 matching lines @@
   bool memory_only_;
 
   base::WeakPtrFactory<CacheStorageCache> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CacheStorageCache);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_CACHE_H_