| Index: net/base/upload_data_stream.cc
|
| ===================================================================
|
| --- net/base/upload_data_stream.cc (revision 4818)
|
| +++ net/base/upload_data_stream.cc (working copy)
|
| @@ -11,8 +11,12 @@
|
|
|
| UploadDataStream::UploadDataStream(const UploadData* data)
|
| : data_(data),
|
| - total_size_(data->GetContentLength()) {
|
| - Reset();
|
| + buf_len_(0),
|
| + next_element_(data->elements().begin()),
|
| + next_element_offset_(0),
|
| + next_element_remaining_(0),
|
| + total_size_(data->GetContentLength()),
|
| + current_position_(0) {
|
| FillBuf();
|
| }
|
|
|
| @@ -31,15 +35,6 @@
|
| current_position_ += num_bytes;
|
| }
|
|
|
| -void UploadDataStream::Reset() {
|
| - next_element_stream_.Close();
|
| - buf_len_ = 0;
|
| - next_element_ = data_->elements().begin();
|
| - next_element_offset_ = 0;
|
| - next_element_remaining_ = 0;
|
| - current_position_ = 0;
|
| -}
|
| -
|
| void UploadDataStream::FillBuf() {
|
| std::vector<UploadData::Element>::const_iterator end =
|
| data_->elements().end();
|
| @@ -68,7 +63,7 @@
|
| DCHECK(element.type() == UploadData::TYPE_FILE);
|
|
|
| if (!next_element_stream_.IsOpen()) {
|
| - int flags = base::PLATFORM_FILE_OPEN |
|
| + int flags = base::PLATFORM_FILE_OPEN |
|
| base::PLATFORM_FILE_READ;
|
| int rv = next_element_stream_.Open(element.file_path(), flags);
|
| // If the file does not exist, that's technically okay.. we'll just
|
|
|