From 9fa94db68a31929a0500a2ef18b163388d6a26e5 Mon Sep 17 00:00:00 2001 From: "hashimoto@chromium.org" Date: Mon, 22 Oct 2012 03:34:07 +0000 Subject: net: Delete special logic for chunked upload The new asynchronous reading logic is also used for chunked upload. UploadDataStream::ReadSync() uses the same code path as Read(). net::ChunkCallback is removed and base::Closure is used instead. OnChunkAvailable() is added to UploadDataStream and removed from HttpStreamParser and SpdyHttpStream. HttpStreamParser's request body reading logic got simplified. BUG=152148 TEST=net_unittests Review URL: https://chromiumcodereview.appspot.com/11187023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163226 0039d316-1c4b-4281-b951-d872f2087c98 --- net/base/upload_data.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'net/base/upload_data.cc') diff --git a/net/base/upload_data.cc b/net/base/upload_data.cc index e9619dd..c8f2be3 100644 --- a/net/base/upload_data.cc +++ b/net/base/upload_data.cc @@ -13,7 +13,6 @@ namespace net { UploadData::UploadData() : identifier_(0), - chunk_callback_(NULL), is_chunked_(false), last_chunk_appended_(false) { } @@ -43,11 +42,11 @@ void UploadData::AppendChunk(const char* bytes, elements_.push_back(UploadElement()); elements_.back().SetToBytes(bytes, bytes_len); last_chunk_appended_ = is_last_chunk; - if (chunk_callback_) - chunk_callback_->OnChunkAvailable(); + if (!chunk_callback_.is_null()) + chunk_callback_.Run(); } -void UploadData::set_chunk_callback(ChunkCallback* callback) { +void UploadData::set_chunk_callback(const base::Closure& callback) { chunk_callback_ = callback; } -- cgit v1.1