diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-11 23:31:08 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-11 23:31:08 +0000 |
| commit | 8c66f1b4a7164a2f7cb61bae3288cd3dc50c2b18 (patch) | |
| tree | 9396e85fcbc44f3a443bca9623b9933ca885d969 /net/base/upload_data_stream.cc | |
| parent | 83df216dbfd197f90b087f74c0a268c1e0db988b (diff) | |
| download | chromium_src-8c66f1b4a7164a2f7cb61bae3288cd3dc50c2b18.zip chromium_src-8c66f1b4a7164a2f7cb61bae3288cd3dc50c2b18.tar.gz chromium_src-8c66f1b4a7164a2f7cb61bae3288cd3dc50c2b18.tar.bz2 | |
Use IOBuffers on UploadDataStream.
This is some cleanup of cl 14998.
R=wtc
BUG=9258
TEST=none
Review URL: http://codereview.chromium.org/115157
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/upload_data_stream.cc')
| -rw-r--r-- | net/base/upload_data_stream.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/base/upload_data_stream.cc b/net/base/upload_data_stream.cc index 0a41a13..468ef6b 100644 --- a/net/base/upload_data_stream.cc +++ b/net/base/upload_data_stream.cc @@ -11,6 +11,7 @@ namespace net { UploadDataStream::UploadDataStream(const UploadData* data) : data_(data), + buf_(new IOBuffer(kBufSize)), buf_len_(0), next_element_(data->elements().begin()), next_element_offset_(0), @@ -28,7 +29,7 @@ void UploadDataStream::DidConsume(size_t num_bytes) { buf_len_ -= num_bytes; if (buf_len_) - memmove(buf_, buf_ + num_bytes, buf_len_); + memmove(buf_->data(), buf_->data() + num_bytes, buf_len_); FillBuf(); @@ -51,7 +52,7 @@ void UploadDataStream::FillBuf() { size_t bytes_copied = std::min(count, size_remaining); - memcpy(buf_ + buf_len_, &d[next_element_offset_], bytes_copied); + memcpy(buf_->data() + buf_len_, &d[next_element_offset_], bytes_copied); buf_len_ += bytes_copied; if (bytes_copied == count) { @@ -88,7 +89,8 @@ void UploadDataStream::FillBuf() { int count = static_cast<int>(std::min( static_cast<uint64>(size_remaining), next_element_remaining_)); if (count > 0 && - (rv = next_element_stream_.Read(buf_ + buf_len_, count, NULL)) > 0) { + (rv = next_element_stream_.Read(buf_->data() + buf_len_, + count, NULL)) > 0) { buf_len_ += rv; next_element_remaining_ -= rv; } else { |