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

Side by Side Diff: net/base/upload_data_stream.cc

Issue 6292013: Add chunked uploads support to SPDY (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/base/upload_data_stream.h" 5 #include "net/base/upload_data_stream.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "net/base/file_stream.h" 9 #include "net/base/file_stream.h"
10 #include "net/base/io_buffer.h" 10 #include "net/base/io_buffer.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 UploadData::Element& element = elements[next_element_]; 62 UploadData::Element& element = elements[next_element_];
63 63
64 size_t size_remaining = kBufSize - buf_len_; 64 size_t size_remaining = kBufSize - buf_len_;
65 if (element.type() == UploadData::TYPE_BYTES || 65 if (element.type() == UploadData::TYPE_BYTES ||
66 element.type() == UploadData::TYPE_CHUNK) { 66 element.type() == UploadData::TYPE_CHUNK) {
67 const std::vector<char>& d = element.bytes(); 67 const std::vector<char>& d = element.bytes();
68 size_t count = d.size() - next_element_offset_; 68 size_t count = d.size() - next_element_offset_;
69 69
70 size_t bytes_copied = std::min(count, size_remaining); 70 size_t bytes_copied = std::min(count, size_remaining);
71 71
72 memcpy(buf_->data() + buf_len_, &d[next_element_offset_], bytes_copied); 72 if (bytes_copied)
Satish 2011/01/28 17:37:51 I left this as is because we need to set 'advance_
willchan no longer on Chromium 2011/02/01 23:35:59 Well, maybe buf_len_ += bytes_copied should be inc
Satish 2011/02/22 14:25:44 Done.
73 memcpy(buf_->data() + buf_len_, &d[next_element_offset_], bytes_copied);
73 buf_len_ += bytes_copied; 74 buf_len_ += bytes_copied;
74 75
75 if (bytes_copied == count) { 76 if (bytes_copied == count) {
76 advance_to_next_element = true; 77 advance_to_next_element = true;
77 } else { 78 } else {
78 next_element_offset_ += bytes_copied; 79 next_element_offset_ += bytes_copied;
79 } 80 }
80 } else { 81 } else {
81 DCHECK(element.type() == UploadData::TYPE_FILE); 82 DCHECK(element.type() == UploadData::TYPE_FILE);
82 83
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 if (!data_->is_chunked() || 133 if (!data_->is_chunked() ||
133 (!elements.empty() && elements.back().is_last_chunk())) { 134 (!elements.empty() && elements.back().is_last_chunk())) {
134 eof_ = true; 135 eof_ = true;
135 } 136 }
136 } 137 }
137 138
138 return OK; 139 return OK;
139 } 140 }
140 141
141 } // namespace net 142 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698