summaryrefslogtreecommitdiffstats
path: root/webkit/appcache/appcache_host.cc
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 20:26:04 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 20:26:04 +0000
commitf06b43b8bf588d08631f5d3dc196fd9c0e9df3c7 (patch)
treec9ac43bc050ff591959e9ff4fd542bde192c708a /webkit/appcache/appcache_host.cc
parentdcd23fee75c291fe9b5e7019e3ee31694442ff9e (diff)
downloadchromium_src-f06b43b8bf588d08631f5d3dc196fd9c0e9df3c7.zip
chromium_src-f06b43b8bf588d08631f5d3dc196fd9c0e9df3c7.tar.gz
chromium_src-f06b43b8bf588d08631f5d3dc196fd9c0e9df3c7.tar.bz2
* Fix a bug with the applicationCache.status return value. The wrong status value was visible via applicationCache.status after a swap because we sample GetStatus() before swappable_cache_ was cleared out.
* Pull the plug on support for file:// urls in DEBUG builds for now. TEST=added to appcache_host_unittest.cc BUG=none Review URL: http://codereview.chromium.org/385071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache/appcache_host.cc')
-rw-r--r--webkit/appcache/appcache_host.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/webkit/appcache/appcache_host.cc b/webkit/appcache/appcache_host.cc
index ab1ff6d..c79aba0 100644
--- a/webkit/appcache/appcache_host.cc
+++ b/webkit/appcache/appcache_host.cc
@@ -338,6 +338,7 @@ void AppCacheHost::AssociateCache(AppCache* cache) {
}
associated_cache_ = cache;
+ SetSwappableCache(cache ? cache->owning_group() : NULL);
if (cache) {
cache->AssociateHost(this);
@@ -345,8 +346,6 @@ void AppCacheHost::AssociateCache(AppCache* cache) {
} else {
frontend_->OnCacheSelected(host_id_, kNoCacheId, UNCACHED);
}
-
- SetSwappableCache(cache ? cache->owning_group() : NULL);
}
} // namespace appcache