| Index: net/base/upload_data_stream.cc
|
| diff --git a/net/base/upload_data_stream.cc b/net/base/upload_data_stream.cc
|
| index 329058c6d771bcf8b4c20e1439cea8c487f97f80..0ec4c97b13b828bed2ce5e42651271102befc113 100644
|
| --- a/net/base/upload_data_stream.cc
|
| +++ b/net/base/upload_data_stream.cc
|
| @@ -12,6 +12,9 @@
|
|
|
| namespace net {
|
|
|
| +UploadDataStream::~UploadDataStream() {
|
| +}
|
| +
|
| UploadDataStream* UploadDataStream::Create(UploadData* data, int* error_code) {
|
| scoped_ptr<UploadDataStream> stream(new UploadDataStream(data));
|
| int rv = stream->FillBuf();
|
| @@ -23,21 +26,6 @@ UploadDataStream* UploadDataStream::Create(UploadData* data, int* error_code) {
|
| return stream.release();
|
| }
|
|
|
| -UploadDataStream::UploadDataStream(UploadData* data)
|
| - : data_(data),
|
| - buf_(new IOBuffer(kBufSize)),
|
| - buf_len_(0),
|
| - next_element_(data->elements()->begin()),
|
| - next_element_offset_(0),
|
| - next_element_remaining_(0),
|
| - total_size_(data->GetContentLength()),
|
| - current_position_(0),
|
| - eof_(false) {
|
| -}
|
| -
|
| -UploadDataStream::~UploadDataStream() {
|
| -}
|
| -
|
| void UploadDataStream::DidConsume(size_t num_bytes) {
|
| DCHECK_LE(num_bytes, buf_len_);
|
| DCHECK(!eof_);
|
| @@ -51,6 +39,18 @@ void UploadDataStream::DidConsume(size_t num_bytes) {
|
| current_position_ += num_bytes;
|
| }
|
|
|
| +UploadDataStream::UploadDataStream(UploadData* data)
|
| + : data_(data),
|
| + buf_(new IOBuffer(kBufSize)),
|
| + buf_len_(0),
|
| + next_element_(data->elements()->begin()),
|
| + next_element_offset_(0),
|
| + next_element_remaining_(0),
|
| + total_size_(data->GetContentLength()),
|
| + current_position_(0),
|
| + eof_(false) {
|
| +}
|
| +
|
| int UploadDataStream::FillBuf() {
|
| std::vector<UploadData::Element>::iterator end =
|
| data_->elements()->end();
|
|
|