More groundwork for flat file based response storage.

webkit/appcache/appcache_storage_impl.h

 // Copyright (c) 2011 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 WEBKIT_APPCACHE_APPCACHE_STORAGE_IMPL_H_
 #define WEBKIT_APPCACHE_APPCACHE_STORAGE_IMPL_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 31 matching lines @@
       AppCacheGroup* group, AppCache* newest_cache, Delegate* delegate);
   virtual void FindResponseForMainRequest(
       const GURL& url, const GURL& preferred_manifest_url, Delegate* delegate);
   virtual void FindResponseForSubRequest(
       AppCache* cache, const GURL& url,
       AppCacheEntry* found_entry, AppCacheEntry* found_fallback_entry,
       bool* found_network_namespace);
   virtual void MarkEntryAsForeign(const GURL& entry_url, int64 cache_id);
   virtual void MakeGroupObsolete(AppCacheGroup* group, Delegate* delegate);
   virtual AppCacheResponseReader* CreateResponseReader(
-      const GURL& manifest_url, int64 response_id);
+      const GURL& manifest_url, int64 group_id, int64 response_id);
   virtual AppCacheResponseWriter* CreateResponseWriter(
-      const GURL& manifest_url);
+      const GURL& manifest_url, int64 group_id);
   virtual void DoomResponses(
       const GURL& manifest_url, const std::vector<int64>& response_ids);
   virtual void DeleteResponses(
       const GURL& manifest_url, const std::vector<int64>& response_ids);
   virtual void PurgeMemory();
 
  private:
   friend class AppCacheStorageImplTest;
 
   // The AppCacheStorageImpl class methods and datamembers may only be
@@ skipping 49 matching lines @@
       const GURL& url,
       const AppCacheEntry& found_entry,
       scoped_refptr<AppCacheGroup> group,
       scoped_refptr<AppCache> newest_cache,
       scoped_refptr<DelegateReference> delegate_ref);
 
   void CallOnMainResponseFound(
       DelegateReferenceVector* delegates,
       const GURL& url, const AppCacheEntry& entry,
       const GURL& fallback_url, const AppCacheEntry& fallback_entry,
-      int64 cache_id, const GURL& manifest_url);
+      int64 cache_id, int64 group_id, const GURL& manifest_url);
 
   APPCACHE_EXPORT AppCacheDiskCache* disk_cache();
 
   // The directory in which we place files in the file system.
   FilePath cache_directory_;
   bool is_incognito_;
 
   // This class operates primarily on the IO thread, but schedules
   // its DatabaseTasks on the db thread. Separately, the disk_cache uses
   // the cache_thread.
@@ skipping 18 matching lines @@
   net::OldCompletionCallbackImpl<AppCacheStorageImpl> doom_callback_;
   net::OldCompletionCallbackImpl<AppCacheStorageImpl> init_callback_;
 
   // Created on the IO thread, but only used on the DB thread.
   AppCacheDatabase* database_;
 
   // Set if we discover a fatal error like a corrupt SQL database or
   // disk cache and cannot continue.
   bool is_disabled_;
 
-  // TODO(michaeln): use a disk_cache per group (manifest or group_id).
   scoped_ptr<AppCacheDiskCache> disk_cache_;
 
   // Used to short-circuit certain operations without having to schedule
   // any tasks on the background database thread.
   std::deque<base::Closure> pending_simple_tasks_;
   base::WeakPtrFactory<AppCacheStorageImpl> weak_factory_;
 
   friend class ChromeAppCacheServiceTest;
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_STORAGE_IMPL_H_