diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-01 20:12:54 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-01 20:12:54 +0000 |
| commit | 37403f36a6984400c226fda2afd139be51043a1c (patch) | |
| tree | 72b6ca06acd47399f37a784a8bb2c96d8dde44fc /content/browser/loader/resource_loader.cc | |
| parent | 584a1aaa6645e49fc05fb7a43c7d6693c329f01e (diff) | |
| download | chromium_src-37403f36a6984400c226fda2afd139be51043a1c.zip chromium_src-37403f36a6984400c226fda2afd139be51043a1c.tar.gz chromium_src-37403f36a6984400c226fda2afd139be51043a1c.tar.bz2 | |
Move TransferNavigationResourceThrottle into CrossSiteResourceHandler.
We now transfer requests to a new process when they are ready to commit, rather than each time a redirect occurs. This simplifies the ResourceDispatcherHost logic, and it prepares for a future CL to intercept all navigations in the browser process.
BUG=238331
TEST=No more than one process swap for repeated redirects.
Review URL: https://codereview.chromium.org/15476003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/loader/resource_loader.cc')
| -rw-r--r-- | content/browser/loader/resource_loader.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc index c99fe5b..8f70ab5 100644 --- a/content/browser/loader/resource_loader.cc +++ b/content/browser/loader/resource_loader.cc @@ -9,6 +9,7 @@ #include "base/metrics/histogram.h" #include "base/time/time.h" #include "content/browser/child_process_security_policy_impl.h" +#include "content/browser/loader/cross_site_resource_handler.h" #include "content/browser/loader/resource_loader_delegate.h" #include "content/browser/loader/resource_request_info_impl.h" #include "content/browser/ssl/ssl_client_auth_handler.h" @@ -165,10 +166,10 @@ void ResourceLoader::MarkAsTransferring(const GURL& target_url) { } void ResourceLoader::CompleteTransfer() { - DCHECK_EQ(DEFERRED_REDIRECT, deferred_stage_); + DCHECK_EQ(DEFERRED_READ, deferred_stage_); is_transferring_ = false; - Resume(); + GetRequestInfo()->cross_site_handler()->ResumeResponse(); } ResourceRequestInfoImpl* ResourceLoader::GetRequestInfo() { |