summaryrefslogtreecommitdiffstats
path: root/webkit/appcache/appcache_update_job.cc
diff options
context:
space:
mode:
authormichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-19 03:11:49 +0000
committermichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-19 03:11:49 +0000
commitc112093004963fb24639127d4a7ce3b2fdfda508 (patch)
tree57a362cf6f46a33db974a0cb7c1eabbf0e93709c /webkit/appcache/appcache_update_job.cc
parente7b1dd8b09de8a10e7f41ae687a731a56e243eea (diff)
downloadchromium_src-c112093004963fb24639127d4a7ce3b2fdfda508.zip
chromium_src-c112093004963fb24639127d4a7ce3b2fdfda508.tar.gz
chromium_src-c112093004963fb24639127d4a7ce3b2fdfda508.tar.bz2
Make the error message more clear in the appcache console logging when an initial cache attempt fails due to a missing manifest file.
BUG=none TEST=manual Review URL: http://codereview.chromium.org/5178003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache/appcache_update_job.cc')
-rw-r--r--webkit/appcache/appcache_update_job.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/webkit/appcache/appcache_update_job.cc b/webkit/appcache/appcache_update_job.cc
index 94d8a05..d34017a 100644
--- a/webkit/appcache/appcache_update_job.cc
+++ b/webkit/appcache/appcache_update_job.cc
@@ -538,7 +538,8 @@ void AppCacheUpdateJob::HandleManifestFetchCompleted(URLRequest* request) {
ContinueHandleManifestFetchCompleted(true);
} else if (response_code == 304 && update_type_ == UPGRADE_ATTEMPT) {
ContinueHandleManifestFetchCompleted(false);
- } else if (response_code == 404 || response_code == 410) {
+ } else if ((response_code == 404 || response_code == 410) &&
+ update_type_ == UPGRADE_ATTEMPT) {
service_->storage()->MakeGroupObsolete(group_, this); // async
} else {
std::string message;
@@ -559,7 +560,8 @@ void AppCacheUpdateJob::HandleManifestFetchCompleted(URLRequest* request) {
void AppCacheUpdateJob::OnGroupMadeObsolete(AppCacheGroup* group,
bool success) {
DCHECK(master_entry_fetches_.empty());
- CancelAllMasterEntryFetches("The group has been made obsolete");
+ CancelAllMasterEntryFetches("The cache has been made obsolete, "
+ "the manifest file returned 404 or 410");
if (success) {
DCHECK(group->is_obsolete());
NotifyAllAssociatedHosts(OBSOLETE_EVENT);
@@ -567,7 +569,7 @@ void AppCacheUpdateJob::OnGroupMadeObsolete(AppCacheGroup* group,
MaybeCompleteUpdate();
} else {
// Treat failure to mark group obsolete as a cache failure.
- HandleCacheFailure("Failed to make the group as obsolete");
+ HandleCacheFailure("Failed to mark the cache as obsolete");
}
}