summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-30 21:24:01 +0000
committerrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-30 21:24:01 +0000
commit038c74707a916a9bae9bd67e4a06b73b9afb8f68 (patch)
treed5e7d85f50b6d6c01aa5a39286fd58272538bf15
parentba5b58e9c77f54691cfcdac352986be8169064de (diff)
downloadchromium_src-038c74707a916a9bae9bd67e4a06b73b9afb8f68.zip
chromium_src-038c74707a916a9bae9bd67e4a06b73b9afb8f68.tar.gz
chromium_src-038c74707a916a9bae9bd67e4a06b73b9afb8f68.tar.bz2
Revert 109479 - Disable caching when downloading.
This fixes a performance regression where local copies of an image (for "Save Image As ..." would not be used. BUG=22900 BUG=100529 Review URL: http://codereview.chromium.org/8494015 TBR=rdsmith@chromium.org Review URL: https://chromiumcodereview.appspot.com/9159044 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@119734 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/download/download_resource_handler.cc4
-rw-r--r--content/browser/renderer_host/resource_dispatcher_host.cc2
2 files changed, 1 insertions, 5 deletions
diff --git a/content/browser/download/download_resource_handler.cc b/content/browser/download/download_resource_handler.cc
index 26f575c..05b59699 100644
--- a/content/browser/download/download_resource_handler.cc
+++ b/content/browser/download/download_resource_handler.cc
@@ -83,10 +83,6 @@ bool DownloadResourceHandler::OnResponseStarted(
VLOG(20) << __FUNCTION__ << "()" << DebugString()
<< " request_id = " << request_id;
download_start_time_ = base::TimeTicks::Now();
-
- // If it's a download, we don't want to poison the cache with it.
- request_->StopCaching();
-
std::string content_disposition;
request_->GetResponseHeaderByName("content-disposition",
&content_disposition);
diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc
index f1b9593..2cc5164 100644
--- a/content/browser/renderer_host/resource_dispatcher_host.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host.cc
@@ -873,7 +873,7 @@ void ResourceDispatcherHost::BeginDownload(
request->set_method("GET");
request->set_context(request_context);
request->set_load_flags(request->load_flags() |
- net::LOAD_IS_DOWNLOAD | net::LOAD_DISABLE_CACHE);
+ net::LOAD_IS_DOWNLOAD);
// Check if the renderer is permitted to request the requested URL.
if (!ChildProcessSecurityPolicy::GetInstance()->