AppCache INTERCEPT namespace.

webkit/appcache/appcache.h

Index: webkit/appcache/appcache.h
===================================================================
--- webkit/appcache/appcache.h	(revision 113279)
+++ webkit/appcache/appcache.h	(working copy)
@@ -92,7 +92,8 @@
   void InitializeWithDatabaseRecords(
       const AppCacheDatabase::CacheRecord& cache_record,
       const std::vector<AppCacheDatabase::EntryRecord>& entries,
-      const std::vector<AppCacheDatabase::FallbackNameSpaceRecord>& fallbacks,
+      const std::vector<AppCacheDatabase::NamespaceRecord>& intercepts,
+      const std::vector<AppCacheDatabase::NamespaceRecord>& fallbacks,
       const std::vector<AppCacheDatabase::OnlineWhiteListRecord>& whitelists);
 
   // Returns the database records to be stored in the AppCacheDatabase
@@ -101,7 +102,8 @@
       const AppCacheGroup* group,
       AppCacheDatabase::CacheRecord* cache_record,
       std::vector<AppCacheDatabase::EntryRecord>* entries,
-      std::vector<AppCacheDatabase::FallbackNameSpaceRecord>* fallbacks,
+      std::vector<AppCacheDatabase::NamespaceRecord>* intercepts,
+      std::vector<AppCacheDatabase::NamespaceRecord>* fallbacks,
       std::vector<AppCacheDatabase::OnlineWhiteListRecord>* whitelists);
 
   bool FindResponseForRequest(const GURL& url,
@@ -128,8 +130,16 @@
   void set_owning_group(AppCacheGroup* group) { owning_group_ = group; }
 
   // FindResponseForRequest helpers
-  FallbackNamespace* FindFallbackNamespace(const GURL& url);
+  const Namespace* FindInterceptNamespace(const GURL& url) {
+    return FindNamespace(intercept_namespaces_, url);
+  }
+  const Namespace* FindFallbackNamespace(const GURL& url) {
+    return FindNamespace(fallback_namespaces_, url);
+  }
+  const Namespace* FindNamespace(const NamespaceVector& namespaces,
+                                 const GURL& url);
 

[jennb, 2011/12/07 21:55:08]

Extra blank line?

[michaeln, 2011/12/08 01:39:00]

Done (locally, not uploaded yet)

+
   // Use AppCacheHost::Associate*Cache() to manipulate host association.
   void AssociateHost(AppCacheHost* host) {
     associated_hosts_.insert(host);
@@ -142,7 +152,8 @@
 
   EntryMap entries_;    // contains entries of all types
 
-  std::vector<FallbackNamespace> fallback_namespaces_;
+  NamespaceVector intercept_namespaces_;
+  NamespaceVector fallback_namespaces_;
   std::vector<GURL> online_whitelist_namespaces_;
   bool online_whitelist_all_;