AppCache: Alter the relative priorities of online vs fallback namespaces.

webkit/appcache/appcache.cc

 // Copyright (c) 2009 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.
 
 #include <algorithm>
 
 #include "webkit/appcache/appcache.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 175 matching lines @@
     GURL* found_fallback_namespace, bool* found_network_namespace) {
   // Ignore fragments when looking up URL in the cache.
   GURL url_no_ref;
   if (url.has_ref()) {
     GURL::Replacements replacements;
     replacements.ClearRef();
     url_no_ref = url.ReplaceComponents(replacements);
   } else {
     url_no_ref = url;
   }
+
+  // 6.6.6 Changes to the networking model
+
   AppCacheEntry* entry = GetEntry(url_no_ref);
   if (entry) {
     *found_entry = *entry;
     return true;
   }
 
+  if (*found_network_namespace =
+         IsInNetworkNamespace(url_no_ref, online_whitelist_namespaces_)) {
+    return true;
+  }
+
   FallbackNamespace* fallback_namespace = FindFallbackNamespace(url_no_ref);
   if (fallback_namespace) {
     entry = GetEntry(fallback_namespace->second);
     DCHECK(entry);
     *found_fallback_entry = *entry;
     *found_fallback_namespace = fallback_namespace->first;
     return true;
   }
 
-  *found_network_namespace = IsInNetworkNamespace(url_no_ref);
+  *found_network_namespace = online_whitelist_all_;
   return *found_network_namespace;
 }
 
 FallbackNamespace* AppCache::FindFallbackNamespace(const GURL& url) {
   size_t count = fallback_namespaces_.size();
   for (size_t i = 0; i < count; ++i) {
     if (StartsWithASCII(
             url.spec(), fallback_namespaces_[i].first.spec(), true)) {
       return &fallback_namespaces_[i];
     }
   }
   return NULL;
 }
 
-bool AppCache::IsInNetworkNamespace(const GURL& url) {
-  if (online_whitelist_all_)
-    return true;
-
+// static
+bool AppCache::IsInNetworkNamespace(
+    const GURL& url,
+    const std::vector<GURL> &namespaces) {
   // TODO(michaeln): There are certainly better 'prefix matching'
   // structures and algorithms that can be applied here and above.
-  size_t count = online_whitelist_namespaces_.size();
+  size_t count = namespaces.size();
   for (size_t i = 0; i < count; ++i) {
-    if (StartsWithASCII(
-            url.spec(), online_whitelist_namespaces_[i].spec(), true)) {
+    if (StartsWithASCII( url.spec(), namespaces[i].spec(), true))

[kinuko, 2010/11/19 00:28:51]

nit: extra space before url.spec()

       return true;
-    }
   }
   return false;
 }
 
 }  // namespace appcache