summaryrefslogtreecommitdiffstats
path: root/webkit/appcache/appcache_request_handler.cc
diff options
context:
space:
mode:
authormichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 23:40:20 +0000
committermichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 23:40:20 +0000
commit07b8eedcd5cf8e9cc6c67f93a52d323d0638d46d (patch)
tree684e9a34c05debd6156ef945c5b60febd2b01de5 /webkit/appcache/appcache_request_handler.cc
parent3f5d5837c8187216a92c5a2c4c171ceeccf54358 (diff)
downloadchromium_src-07b8eedcd5cf8e9cc6c67f93a52d323d0638d46d.zip
chromium_src-07b8eedcd5cf8e9cc6c67f93a52d323d0638d46d.tar.gz
chromium_src-07b8eedcd5cf8e9cc6c67f93a52d323d0638d46d.tar.bz2
Put minimal appcache info in the netlog.
BUG=49854 TEST=manual Review URL: http://codereview.chromium.org/2847068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache/appcache_request_handler.cc')
-rw-r--r--webkit/appcache/appcache_request_handler.cc19
1 files changed, 10 insertions, 9 deletions
diff --git a/webkit/appcache/appcache_request_handler.cc b/webkit/appcache/appcache_request_handler.cc
index 28a9149..432534b 100644
--- a/webkit/appcache/appcache_request_handler.cc
+++ b/webkit/appcache/appcache_request_handler.cc
@@ -97,8 +97,8 @@ AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForRedirect(
// 6.9.6, step 4: If this results in a redirect to another origin,
// get the resource of the fallback entry.
job_ = new AppCacheURLRequestJob(request, storage());
- DeliverAppCachedResponse(found_fallback_entry_, found_cache_id_,
- found_manifest_url_);
+ DeliverAppCachedResponse(
+ found_fallback_entry_, found_cache_id_, found_manifest_url_, true);
} else if (!found_network_namespace_) {
// 6.9.6, step 6: Fail the resource load.
job_ = new AppCacheURLRequestJob(request, storage());
@@ -138,8 +138,8 @@ AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForResponse(
// 6.9.6, step 4: If this results in a 4xx or 5xx status code
// or there were network errors, get the resource of the fallback entry.
job_ = new AppCacheURLRequestJob(request, storage());
- DeliverAppCachedResponse(found_fallback_entry_, found_cache_id_,
- found_manifest_url_);
+ DeliverAppCachedResponse(
+ found_fallback_entry_, found_cache_id_, found_manifest_url_, true);
return job_;
}
@@ -156,10 +156,11 @@ void AppCacheRequestHandler::OnDestructionImminent(AppCacheHost* host) {
}
void AppCacheRequestHandler::DeliverAppCachedResponse(
- const AppCacheEntry& entry, int64 cache_id, const GURL& manifest_url) {
+ const AppCacheEntry& entry, int64 cache_id, const GURL& manifest_url,
+ bool is_fallback) {
DCHECK(job_ && job_->is_waiting());
DCHECK(entry.has_response_id());
- job_->DeliverAppCachedResponse(manifest_url, cache_id, entry);
+ job_->DeliverAppCachedResponse(manifest_url, cache_id, entry, is_fallback);
}
void AppCacheRequestHandler::DeliverErrorResponse() {
@@ -220,8 +221,8 @@ void AppCacheRequestHandler::OnMainResponseFound(
found_network_namespace_ = false; // not applicable to main requests
if (found_entry_.has_response_id()) {
- DeliverAppCachedResponse(found_entry_, found_cache_id_,
- found_manifest_url_);
+ DeliverAppCachedResponse(
+ found_entry_, found_cache_id_, found_manifest_url_, false);
} else {
DeliverNetworkResponse();
}
@@ -271,7 +272,7 @@ void AppCacheRequestHandler::ContinueMaybeLoadSubResource() {
found_cache_id_ = cache->cache_id();
found_manifest_url_ = cache->owning_group()->manifest_url();
DeliverAppCachedResponse(
- found_entry_, found_cache_id_, found_manifest_url_);
+ found_entry_, found_cache_id_, found_manifest_url_, false);
return;
}