AppCache INTERCEPT namespace.

webkit/appcache/appcache_update_job.cc

 // 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.
 
 #include "webkit/appcache/appcache_update_job.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 851 matching lines @@
   }
 }
 
 void AppCacheUpdateJob::BuildUrlFileList(const Manifest& manifest) {
   for (base::hash_set<std::string>::const_iterator it =
            manifest.explicit_urls.begin();
        it != manifest.explicit_urls.end(); ++it) {
     AddUrlToFileList(GURL(*it), AppCacheEntry::EXPLICIT);
   }
 
-  // TODO(michaeln): Add resources from intercept namepsaces too.
-  // http://code.google.com/p/chromium/issues/detail?id=101565
+  const std::vector<Namespace>& intercepts =
+      manifest.intercept_namespaces;
+  for (std::vector<Namespace>::const_iterator it = intercepts.begin();
+       it != intercepts.end(); ++it) {
+     AddUrlToFileList(it->target_url, AppCacheEntry::INTERCEPT);
+  }
 
-  const std::vector<FallbackNamespace>& fallbacks =
+  const std::vector<Namespace>& fallbacks =
       manifest.fallback_namespaces;
-  for (std::vector<FallbackNamespace>::const_iterator it = fallbacks.begin();
+  for (std::vector<Namespace>::const_iterator it = fallbacks.begin();
        it != fallbacks.end(); ++it) {
-     AddUrlToFileList(it->second, AppCacheEntry::FALLBACK);
+     AddUrlToFileList(it->target_url, AppCacheEntry::FALLBACK);
   }
 
   // Add all master entries from newest complete cache.
   if (update_type_ == UPGRADE_ATTEMPT) {
     const AppCache::EntryMap& entries =
         group_->newest_complete_cache()->entries();
     for (AppCache::EntryMap::const_iterator it = entries.begin();
          it != entries.end(); ++it) {
       const AppCacheEntry& entry = it->second;
       if (entry.IsMaster())
@@ skipping 426 matching lines @@
 
   // Break the connection with the group so the group cannot call delete
   // on this object after we've posted a task to delete ourselves.
   group_->SetUpdateStatus(AppCacheGroup::IDLE);
   group_ = NULL;
 
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 }  // namespace appcache