diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-08 21:28:47 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-08 21:28:47 +0000 |
| commit | 75ed8829d991b62b4943a29b0140d6803a70cac1 (patch) | |
| tree | 570c736b9264258df901c113929f0be309e6c87c /content/browser/loader/throttling_resource_handler.cc | |
| parent | fb3bf2d6fb8bc7da2cdf0bd5798908672a9697fb (diff) | |
| download | chromium_src-75ed8829d991b62b4943a29b0140d6803a70cac1.zip chromium_src-75ed8829d991b62b4943a29b0140d6803a70cac1.tar.gz chromium_src-75ed8829d991b62b4943a29b0140d6803a70cac1.tar.bz2 | |
Revert 227318 "Clean up ResourceHandler API."
Could be causing http://crbug.com/305333.
> Clean up ResourceHandler API.
>
> 1. Move URLRequest member to ResourceHandler base class and add convenience functions for subclasses.
> 2. Make OnWillRead take a scoped_refptr to avoid leaking the buffer.
>
> BUG=295239
> TEST=No behavior change.
>
> Review URL: https://codereview.chromium.org/25536005
TBR=creis@chromium.org
Review URL: https://codereview.chromium.org/26472004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227594 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/loader/throttling_resource_handler.cc')
| -rw-r--r-- | content/browser/loader/throttling_resource_handler.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/content/browser/loader/throttling_resource_handler.cc b/content/browser/loader/throttling_resource_handler.cc index 23f77da..8bb5446 100644 --- a/content/browser/loader/throttling_resource_handler.cc +++ b/content/browser/loader/throttling_resource_handler.cc @@ -4,7 +4,7 @@ #include "content/browser/loader/throttling_resource_handler.h" -#include "content/browser/loader/resource_request_info_impl.h" +#include "content/public/browser/resource_request_info.h" #include "content/public/browser/resource_throttle.h" #include "content/public/common/resource_response.h" @@ -14,8 +14,9 @@ ThrottlingResourceHandler::ThrottlingResourceHandler( scoped_ptr<ResourceHandler> next_handler, net::URLRequest* request, ScopedVector<ResourceThrottle> throttles) - : LayeredResourceHandler(request, next_handler.Pass()), + : LayeredResourceHandler(next_handler.Pass()), deferred_stage_(DEFERRED_NONE), + request_(request), throttles_(throttles.Pass()), index_(0), cancelled_by_resource_throttle_(false) { @@ -140,7 +141,8 @@ void ThrottlingResourceHandler::ResumeStart() { deferred_url_ = GURL(); bool defer = false; - if (!OnWillStart(GetRequestID(), url, &defer)) { + const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_); + if (!OnWillStart(info->GetRequestID(), url, &defer)) { controller()->Cancel(); } else if (!defer) { controller()->Resume(); @@ -156,7 +158,9 @@ void ThrottlingResourceHandler::ResumeRedirect() { deferred_response_.swap(response); bool defer = false; - if (!OnRequestRedirected(GetRequestID(), new_url, response.get(), &defer)) { + const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_); + if (!OnRequestRedirected(info->GetRequestID(), new_url, response.get(), + &defer)) { controller()->Cancel(); } else if (!defer) { controller()->Resume(); @@ -170,7 +174,8 @@ void ThrottlingResourceHandler::ResumeResponse() { deferred_response_.swap(response); bool defer = false; - if (!OnResponseStarted(GetRequestID(), response.get(), &defer)) { + const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_); + if (!OnResponseStarted(info->GetRequestID(), response.get(), &defer)) { controller()->Cancel(); } else if (!defer) { controller()->Resume(); |