Factor out chunk encoding logic into HttpStreamParser::EncodeChunk().

net/base/upload_data_stream.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/upload_data_stream.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 #include "net/base/file_stream.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 
 namespace net {
 
+const size_t UploadDataStream::kBufferSize = 16384;

[Nico, 2012/01/19 15:09:07]

Since this is now in the cc file, it can't be inlined, which causes other files
that allocate static arrays with this size to have static initializers. See
http://build.chromium.org/f/chromium/perf/linux-release/sizes/report.html?his...

I'll revert this change for now.

 bool UploadDataStream::merge_chunks_ = true;
 
 UploadDataStream::~UploadDataStream() {
 }
 
 UploadDataStream* UploadDataStream::Create(UploadData* data, int* error_code) {
   scoped_ptr<UploadDataStream> stream(new UploadDataStream(data));
   int rv = stream->FillBuf();
   if (error_code)
     *error_code = rv;
@@ skipping 13 matching lines @@
       memmove(buf_->data(), buf_->data() + num_bytes, buf_len_);
   }
 
   FillBuf();
 
   current_position_ += num_bytes;
 }
 
 UploadDataStream::UploadDataStream(UploadData* data)
     : data_(data),
-      buf_(new IOBuffer(kBufSize)),
+      buf_(new IOBuffer(kBufferSize)),
       buf_len_(0),
       next_element_(0),
       next_element_offset_(0),
       next_element_remaining_(0),
       total_size_(data->GetContentLength()),
       current_position_(0),
       eof_(false) {
 }
 
 int UploadDataStream::FillBuf() {
   std::vector<UploadData::Element>& elements = *data_->elements();
 
-  while (buf_len_ < kBufSize && next_element_ < elements.size()) {
+  while (buf_len_ < kBufferSize && next_element_ < elements.size()) {
     bool advance_to_next_element = false;
 
     UploadData::Element& element = elements[next_element_];
 
-    size_t size_remaining = kBufSize - buf_len_;
+    size_t size_remaining = kBufferSize - buf_len_;
     if (element.type() == UploadData::TYPE_BYTES ||
         element.type() == UploadData::TYPE_CHUNK) {
       const std::vector<char>& d = element.bytes();
       size_t count = d.size() - next_element_offset_;
 
       size_t bytes_copied = std::min(count, size_remaining);
 
       // Check if we have anything to copy first, because we are getting the
       // address of an element in |d| and that will throw an exception if |d|
       // is an empty vector.
@@ skipping 77 matching lines @@
 bool UploadDataStream::IsOnLastChunk() const {
   const std::vector<UploadData::Element>& elements = *data_->elements();
   DCHECK(data_->is_chunked());
   return (eof_ ||
           (!elements.empty() &&
            next_element_ == elements.size() &&
            elements.back().is_last_chunk()));
 }
 
 }  // namespace net