AppCache INTERCEPT namespace.

webkit/appcache/appcache.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_H_
 #define WEBKIT_APPCACHE_APPCACHE_H_
 
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 74 matching lines @@
   void set_update_time(base::Time ticks) { update_time_ = ticks; }
 
   // Initializes the cache with information in the manifest.
   // Do not use the manifest after this call.
   void InitializeWithManifest(Manifest* manifest);
 
   // Initializes the cache with the information in the database records.
   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
   // to represent this cache.
   void ToDatabaseRecords(
       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,
       AppCacheEntry* found_entry, AppCacheEntry* found_fallback_entry,
       GURL* found_fallback_namespace, bool* found_network_namespace);
 
   // Populates the 'infos' vector with an element per entry in the appcache.
   void ToResourceInfoVector(AppCacheResourceInfoVector* infos) const;
 
   static bool IsInNetworkNamespace(
       const GURL& url,
       const std::vector<GURL> &namespaces);
 
  private:
   friend class AppCacheGroup;
   friend class AppCacheHost;
   friend class AppCacheStorageImplTest;
   friend class AppCacheUpdateJobTest;
   friend class base::RefCounted<AppCache>;
 
   ~AppCache();
 
   // Use AppCacheGroup::Add/RemoveCache() to manipulate owning group.
   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);
   }
   void UnassociateHost(AppCacheHost* host);
 
   const int64 cache_id_;
   scoped_refptr<AppCacheGroup> owning_group_;
   AppCacheHosts associated_hosts_;
 
   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_;
 
   bool is_complete_;
 
   // when this cache was last updated
   base::Time update_time_;
 
   int64 cache_size_;
 
   // to notify service when cache is deleted
   AppCacheService* service_;
 
   FRIEND_TEST_ALL_PREFIXES(AppCacheTest, InitializeWithManifest);
 
   DISALLOW_COPY_AND_ASSIGN(AppCache);
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_H_