Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(924)

Unified Diff: net/url_request/mime_sniffer_proxy.cc

Issue 18390: Change URLRequest to use a ref-counted buffer for actual IO.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/url_request/mime_sniffer_proxy.h ('k') | net/url_request/url_request.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/mime_sniffer_proxy.cc
===================================================================
--- net/url_request/mime_sniffer_proxy.cc (revision 8565)
+++ net/url_request/mime_sniffer_proxy.cc (working copy)
@@ -6,10 +6,13 @@
#include "net/base/mime_sniffer.h"
+static const int kBufferSize = 1024;
+
MimeSnifferProxy::MimeSnifferProxy(URLRequest* request,
URLRequest::Delegate* delegate)
: request_(request), delegate_(delegate),
- sniff_content_(false), error_(false) {
+ sniff_content_(false), error_(false),
+ buf_(new net::IOBuffer(kBufferSize)) {
request->set_delegate(this);
}
@@ -20,7 +23,7 @@
// We need to read content before we know the mime type,
// so we don't call OnResponseStarted.
sniff_content_ = true;
- if (request_->Read(buf_, sizeof(buf_), &bytes_read_) && bytes_read_) {
+ if (request_->Read(buf_, kBufferSize, &bytes_read_) && bytes_read_) {
OnReadCompleted(request, bytes_read_);
} else if (!request_->status().is_io_pending()) {
error_ = true;
@@ -32,7 +35,8 @@
delegate_->OnResponseStarted(request);
}
-bool MimeSnifferProxy::Read(char* buf, int max_bytes, int *bytes_read) {
+bool MimeSnifferProxy::Read(net::IOBuffer* buf, int max_bytes,
+ int *bytes_read) {
if (sniff_content_) {
// This is the first call to Read() after we've sniffed content.
// Return our local buffer or the error we ran into.
@@ -43,7 +47,7 @@
return false;
}
- memcpy(buf, buf_, bytes_read_);
+ memcpy(buf->data(), buf_->data(), bytes_read_);
*bytes_read = bytes_read_;
return true;
}
@@ -57,8 +61,8 @@
std::string type_hint;
request_->GetMimeType(&type_hint);
bytes_read_ = bytes_read;
- net::SniffMimeType(
- buf_, bytes_read_, request_->url(), type_hint, &mime_type_);
+ net::SniffMimeType(buf_->data(), bytes_read_, request_->url(),
+ type_hint, &mime_type_);
} else {
error_ = true;
}
« no previous file with comments | « net/url_request/mime_sniffer_proxy.h ('k') | net/url_request/url_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698