[SPDY] Change SpdyStream::QueueStreamData() To SendStreamData()

net/spdy/spdy_http_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/spdy/spdy_http_stream.h"
 
 #include <algorithm>
 #include <list>
 
 #include "base/bind.h"
@@ skipping 20 matching lines @@
       spdy_session_(spdy_session),
       stream_closed_(false),
       closed_stream_pushed_(false),
       closed_stream_status_(ERR_FAILED),
       closed_stream_id_(0),
       request_info_(NULL),
       has_upload_data_(false),
       response_info_(NULL),
       response_headers_received_(false),
       user_buffer_len_(0),
+      raw_request_body_buf_size_(0),
       buffered_read_callback_pending_(false),
       more_read_data_pending_(false),
       direct_(direct) {}
 
 void SpdyHttpStream::InitializeWithExistingStream(
     const base::WeakPtr<SpdyStream>& spdy_stream) {
   stream_ = spdy_stream;
   stream_->SetDelegate(this);
   response_headers_received_ = true;
 }
@@ skipping 178 matching lines @@
 
   CHECK(!has_upload_data_);
   has_upload_data_ = request_info_->upload_data_stream &&
       (request_info_->upload_data_stream->size() ||
        request_info_->upload_data_stream->is_chunked());
   if (has_upload_data_) {
     // Use kMaxSpdyFrameChunkSize as the buffer size, since the request
     // body data is written with this size at a time.
     raw_request_body_buf_ = new IOBufferWithSize(kMaxSpdyFrameChunkSize);
     // The request body buffer is empty at first.
-    request_body_buf_ = new DrainableIOBuffer(raw_request_body_buf_, 0);
+    raw_request_body_buf_size_ = 0;
   }
 
   CHECK(!callback.is_null());
   CHECK(response);
 
   // SendRequest can be called in two cases.
   //
   // a) A client initiated request. In this case, |response_info_| should be
   //    NULL to start with.
   // b) A client request which matches a response that the server has already
@@ skipping 31 matching lines @@
 }
 
 SpdySendStatus SpdyHttpStream::OnSendHeadersComplete() {
   if (!callback_.is_null())
     DoCallback(OK);
   return has_upload_data_ ? MORE_DATA_TO_SEND : NO_MORE_DATA_TO_SEND;
 }
 
 void SpdyHttpStream::OnSendBody() {
   CHECK(request_info_ && request_info_->upload_data_stream);
-  if (request_body_buf_->BytesRemaining() > 0) {
+  if (raw_request_body_buf_size_ > 0) {
     SendRequestBodyData();
   } else {
     // We shouldn't be called if there's no more data to read.
     CHECK(!request_info_->upload_data_stream->IsEOF());
     ReadAndSendRequestBodyData();
   }
 }
 
-SpdySendStatus SpdyHttpStream::OnSendBodyComplete(size_t bytes_sent) {
+SpdySendStatus SpdyHttpStream::OnSendBodyComplete() {
   // |status| is the number of bytes written to the SPDY stream.
   CHECK(request_info_ && request_info_->upload_data_stream);
-  DCHECK_GE(static_cast<int>(bytes_sent), 0);
-  DCHECK_LE(static_cast<int>(bytes_sent), request_body_buf_->BytesRemaining());
-
-  request_body_buf_->DidConsume(static_cast<int>(bytes_sent));
+  raw_request_body_buf_size_ = 0;
 
   // Check for more data to send.
-  if (!request_info_->upload_data_stream->IsEOF() ||
-      (request_body_buf_->BytesRemaining() > 0))
-    return MORE_DATA_TO_SEND;
-
-  return NO_MORE_DATA_TO_SEND;
+  return request_info_->upload_data_stream->IsEOF() ?
+      NO_MORE_DATA_TO_SEND : MORE_DATA_TO_SEND;
 }
 
 int SpdyHttpStream::OnResponseReceived(const SpdyHeaderBlock& response,
                                        base::Time response_time,
                                        int status) {
   if (!response_info_) {
     DCHECK(stream_->pushed());
     push_response_info_.reset(new HttpResponseInfo);
     response_info_ = push_response_info_.get();
   }
@@ skipping 71 matching lines @@
 
     if (user_buffer_) {
       // Handing small chunks of data to the caller creates measurable overhead.
       // We buffer data in short time-spans and send a single read notification.
       ScheduleBufferedReadCallback();
     }
   }
   return OK;
 }
 
-void SpdyHttpStream::OnDataSent(size_t /*bytes_sent*/) {
+void SpdyHttpStream::OnDataSent() {
   // For HTTP streams, no data is sent from the client while in the OPEN state,
   // so it is never called.
-  NOTREACHED();
+  CHECK(false);
 }
 
 void SpdyHttpStream::OnClose(int status) {
   if (stream_) {
     stream_closed_ = true;
     closed_stream_pushed_ = stream_->pushed();
     closed_stream_status_ = status;
     closed_stream_id_ = stream_->stream_id();
   }
   stream_.reset();
@@ skipping 11 matching lines @@
     int rv) {
   if (rv == OK) {
     stream_ = stream_request_.ReleaseStream();
     stream_->SetDelegate(this);
   }
   callback.Run(rv);
 }
 
 void SpdyHttpStream::ReadAndSendRequestBodyData() {
   CHECK(request_info_ && request_info_->upload_data_stream);
-  CHECK_EQ(0, request_body_buf_->BytesRemaining());
+  CHECK_EQ(raw_request_body_buf_size_, 0);
 
   // Read the data from the request body stream.
   const int rv = request_info_->upload_data_stream->Read(
       raw_request_body_buf_, raw_request_body_buf_->size(),
       base::Bind(
           &SpdyHttpStream::OnRequestBodyReadCompleted,
           weak_factory_.GetWeakPtr()));
 
   if (rv != ERR_IO_PENDING) {
     // ERR_IO_PENDING is the only possible error.
     CHECK_GE(rv, 0);
     OnRequestBodyReadCompleted(rv);
   }
 }
 
 void SpdyHttpStream::OnRequestBodyReadCompleted(int status) {
   CHECK_GE(status, 0);
-  request_body_buf_ = new DrainableIOBuffer(raw_request_body_buf_, status);
+  raw_request_body_buf_size_ = status;
   SendRequestBodyData();
 }
 
 void SpdyHttpStream::SendRequestBodyData() {
   const bool eof = request_info_->upload_data_stream->IsEOF();
   if (eof) {
-    CHECK_GE(request_body_buf_->BytesRemaining(), 0);
+    CHECK_GE(raw_request_body_buf_size_, 0);
   } else {
-    CHECK_GT(request_body_buf_->BytesRemaining(), 0);
+    CHECK_GT(raw_request_body_buf_size_, 0);
   }
-  stream_->QueueStreamData(request_body_buf_,
-                           request_body_buf_->BytesRemaining(),
-                           eof ? DATA_FLAG_FIN : DATA_FLAG_NONE);
+  stream_->SendStreamData(raw_request_body_buf_,
+                          raw_request_body_buf_size_,
+                          eof ? DATA_FLAG_FIN : DATA_FLAG_NONE);
 }
 
 void SpdyHttpStream::ScheduleBufferedReadCallback() {
   // If there is already a scheduled DoBufferedReadCallback, don't issue
   // another one.  Mark that we have received more data and return.
   if (buffered_read_callback_pending_) {
     more_read_data_pending_ = true;
     return;
   }
 
@@ skipping 78 matching lines @@
 bool SpdyHttpStream::IsSpdyHttpStream() const {
   return true;
 }
 
 void SpdyHttpStream::Drain(HttpNetworkSession* session) {
   Close(false);
   delete this;
 }
 
 }  // namespace net