From 6a14c19a4fbcfe5b21b1b6b3aa2f01874732d909 Mon Sep 17 00:00:00 2001 From: "tyoshino@chromium.org" Date: Tue, 6 Aug 2013 20:18:42 +0000 Subject: Clean up on byte_stream (mainly style and includes) - Don't allocate ContentVector if input_contents_size_ is 0 - Remove unused weak_ptr.h and lock.h - Add comments required by style guide - Move includes not used in .h to .cc BUG= Review URL: https://chromiumcodereview.appspot.com/21839002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215958 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/byte_stream.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'content/browser/byte_stream.cc') diff --git a/content/browser/byte_stream.cc b/content/browser/byte_stream.cc index d1f5e17..a8b8f29 100644 --- a/content/browser/byte_stream.cc +++ b/content/browser/byte_stream.cc @@ -4,10 +4,13 @@ #include "content/browser/byte_stream.h" +#include +#include +#include + #include "base/bind.h" #include "base/location.h" #include "base/memory/ref_counted.h" -#include "base/memory/weak_ptr.h" #include "base/sequenced_task_runner.h" namespace content { @@ -263,7 +266,7 @@ void ByteStreamWriterImpl::PostToPeer(bool complete, int status) { // Valid contexts in which to call. DCHECK(complete || 0 != input_contents_size_); - scoped_ptr transfer_buffer(new ContentVector); + scoped_ptr transfer_buffer; size_t buffer_size = 0; if (0 != input_contents_size_) { transfer_buffer.reset(new ContentVector); @@ -370,8 +373,8 @@ void ByteStreamReaderImpl::TransferDataInternal( if (transfer_buffer) { available_contents_.insert(available_contents_.end(), - transfer_buffer->begin(), - transfer_buffer->end()); + transfer_buffer->begin(), + transfer_buffer->end()); } if (source_complete) { @@ -408,7 +411,6 @@ void ByteStreamReaderImpl::MaybeUpdateInput() { } // namespace - const int ByteStreamWriter::kFractionBufferBeforeSending = 3; const int ByteStreamReader::kFractionReadBeforeWindowUpdate = 3; -- cgit v1.1