| Index: net/base/chunked_upload_data_stream.cc
|
| diff --git a/net/base/chunked_upload_data_stream.cc b/net/base/chunked_upload_data_stream.cc
|
| index f1fbf0822c854af2eae4b9d87b41a057775409a0..92f8980ca8c724ac0979f08cd119207fa6796680 100644
|
| --- a/net/base/chunked_upload_data_stream.cc
|
| +++ b/net/base/chunked_upload_data_stream.cc
|
| @@ -22,8 +22,9 @@ ChunkedUploadDataStream::ChunkedUploadDataStream(int64 identifier)
|
| ChunkedUploadDataStream::~ChunkedUploadDataStream() {
|
| }
|
|
|
| -void ChunkedUploadDataStream::AppendData(
|
| - const char* data, int data_len, bool is_done) {
|
| +void ChunkedUploadDataStream::AppendData(const char* data,
|
| + int data_len,
|
| + bool is_done) {
|
| DCHECK(!all_data_appended_);
|
| DCHECK(data_len > 0 || is_done);
|
| if (data_len > 0) {
|
| @@ -75,11 +76,9 @@ int ChunkedUploadDataStream::ReadChunk(IOBuffer* buf, int buf_len) {
|
| int bytes_read = 0;
|
| while (read_index_ < upload_data_.size() && bytes_read < buf_len) {
|
| std::vector<char>* data = upload_data_[read_index_];
|
| - size_t bytes_to_read =
|
| - std::min(static_cast<size_t>(buf_len - bytes_read),
|
| - data->size() - read_offset_);
|
| - memcpy(buf->data() + bytes_read,
|
| - vector_as_array(data) + read_offset_,
|
| + size_t bytes_to_read = std::min(static_cast<size_t>(buf_len - bytes_read),
|
| + data->size() - read_offset_);
|
| + memcpy(buf->data() + bytes_read, vector_as_array(data) + read_offset_,
|
| bytes_to_read);
|
| bytes_read += bytes_to_read;
|
| read_offset_ += bytes_to_read;
|
|
|