summaryrefslogtreecommitdiffstats
path: root/content/browser/loader/stream_resource_handler.cc
diff options
context:
space:
mode:
authorcreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-08 21:28:47 +0000
committercreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-08 21:28:47 +0000
commit75ed8829d991b62b4943a29b0140d6803a70cac1 (patch)
tree570c736b9264258df901c113929f0be309e6c87c /content/browser/loader/stream_resource_handler.cc
parentfb3bf2d6fb8bc7da2cdf0bd5798908672a9697fb (diff)
downloadchromium_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/stream_resource_handler.cc')
-rw-r--r--content/browser/loader/stream_resource_handler.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/loader/stream_resource_handler.cc b/content/browser/loader/stream_resource_handler.cc
index 8c8aae0..1e2acc8 100644
--- a/content/browser/loader/stream_resource_handler.cc
+++ b/content/browser/loader/stream_resource_handler.cc
@@ -19,7 +19,7 @@ StreamResourceHandler::StreamResourceHandler(
net::URLRequest* request,
StreamRegistry* registry,
const GURL& origin)
- : ResourceHandler(request),
+ : request_(request),
read_buffer_(NULL) {
// TODO(tyoshino): Find a way to share this with the blob URL creation in
// WebKit.
@@ -58,7 +58,7 @@ bool StreamResourceHandler::OnWillStart(int request_id,
}
bool StreamResourceHandler::OnWillRead(int request_id,
- scoped_refptr<net::IOBuffer>* buf,
+ net::IOBuffer** buf,
int* buf_size,
int min_size) {
static const int kReadBufSize = 32768;