summaryrefslogtreecommitdiffstats
path: root/content/browser/loader/async_resource_handler.cc
diff options
context:
space:
mode:
authordavidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 05:49:03 +0000
committerdavidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 05:49:03 +0000
commit3780874a5b4d7470daf71357a7d5d001347f50b7 (patch)
treecdca9150eef2a25fb0bf173be11cc9c8a5958eed /content/browser/loader/async_resource_handler.cc
parent4477aae3367d44c3000b312b7e4b531babf35b66 (diff)
downloadchromium_src-3780874a5b4d7470daf71357a7d5d001347f50b7.zip
chromium_src-3780874a5b4d7470daf71357a7d5d001347f50b7.tar.gz
chromium_src-3780874a5b4d7470daf71357a7d5d001347f50b7.tar.bz2
Make ResourceHandler::OnResponseCompleted take a defer output parameter.
Every other method of ResourceHandler returns false to abort and sets *defer to cancel. Between the StreamResourceHandler fix here and https://src.chromium.org/viewvc/chrome?view=rev&revision=233661, there were twice as many ResourceHandlers that mistakenly deferred shutdown as intentionally. (RedirectToFileResourceHandler and CrossSiteResourceHandler do so intentionally.) Make this consistent so it's not as confusing. BUG=none Review URL: https://codereview.chromium.org/74373002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235631 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/loader/async_resource_handler.cc')
-rw-r--r--content/browser/loader/async_resource_handler.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/loader/async_resource_handler.cc b/content/browser/loader/async_resource_handler.cc
index 2a1412c..5983052 100644
--- a/content/browser/loader/async_resource_handler.cc
+++ b/content/browser/loader/async_resource_handler.cc
@@ -304,13 +304,14 @@ void AsyncResourceHandler::OnDataDownloaded(
}
}
-bool AsyncResourceHandler::OnResponseCompleted(
+void AsyncResourceHandler::OnResponseCompleted(
int request_id,
const net::URLRequestStatus& status,
- const std::string& security_info) {
+ const std::string& security_info,
+ bool* defer) {
const ResourceRequestInfoImpl* info = GetRequestInfo();
if (!info->filter())
- return true;
+ return;
// If we crash here, figure out what URL the renderer was requesting.
// http://crbug.com/107692
@@ -353,7 +354,6 @@ bool AsyncResourceHandler::OnResponseCompleted(
was_ignored_by_handler,
security_info,
completion_time));
- return true;
}
bool AsyncResourceHandler::EnsureResourceBufferIsInitialized() {