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

net/spdy/spdy_websocket_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_websocket_stream.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/spdy/spdy_framer.h"
 #include "net/spdy/spdy_protocol.h"
 #include "net/spdy/spdy_session.h"
 #include "net/spdy/spdy_stream.h"
 
 namespace net {
 
 SpdyWebSocketStream::SpdyWebSocketStream(
     SpdySession* spdy_session, Delegate* delegate)
     : weak_ptr_factory_(this),
       spdy_session_(spdy_session),
+      pending_send_data_length_(0),
       delegate_(delegate) {
   DCHECK(spdy_session_);
   DCHECK(delegate_);
 }
 
 SpdyWebSocketStream::~SpdyWebSocketStream() {
   delegate_ = NULL;
   Close();
 }
 
@@ skipping 26 matching lines @@
   if (result < OK && result != ERR_IO_PENDING)
     Close();
   return result;
 }
 
 int SpdyWebSocketStream::SendData(const char* data, int length) {
   if (!stream_) {
     NOTREACHED();
     return ERR_UNEXPECTED;
   }
+  DCHECK_GE(length, 0);
+  pending_send_data_length_ = static_cast<size_t>(length);
   scoped_refptr<IOBuffer> buf(new IOBuffer(length));
   memcpy(buf->data(), data, length);
-  stream_->QueueStreamData(buf.get(), length, DATA_FLAG_NONE);
+  stream_->SendStreamData(buf.get(), length, DATA_FLAG_NONE);
   return ERR_IO_PENDING;
 }
 
 void SpdyWebSocketStream::Close() {
   if (stream_) {
     stream_->Close();
     DCHECK(!stream_);
   }
 }
 
 SpdySendStatus SpdyWebSocketStream::OnSendHeadersComplete() {
   DCHECK(delegate_);
   delegate_->OnSentSpdyHeaders();
   return NO_MORE_DATA_TO_SEND;
 }
 
 void SpdyWebSocketStream::OnSendBody() {
   CHECK(false);
 }
 
-SpdySendStatus SpdyWebSocketStream::OnSendBodyComplete(size_t bytes_sent) {
+SpdySendStatus SpdyWebSocketStream::OnSendBodyComplete() {
   CHECK(false);
   return NO_MORE_DATA_TO_SEND;
 }
 
 int SpdyWebSocketStream::OnResponseReceived(
     const SpdyHeaderBlock& response,
     base::Time response_time, int status) {
   DCHECK(delegate_);
   return delegate_->OnReceivedSpdyResponseHeader(response, status);
 }
 
 void SpdyWebSocketStream::OnHeadersSent() {
   // This will be called when WebSocket over SPDY supports new framing.
   NOTREACHED();
 }
 
 int SpdyWebSocketStream::OnDataReceived(scoped_ptr<SpdyBuffer> buffer) {
   DCHECK(delegate_);
   delegate_->OnReceivedSpdyData(buffer.Pass());
   return OK;
 }
 
-void SpdyWebSocketStream::OnDataSent(size_t bytes_sent) {
+void SpdyWebSocketStream::OnDataSent() {
   DCHECK(delegate_);
-  delegate_->OnSentSpdyData(bytes_sent);
+  delegate_->OnSentSpdyData(pending_send_data_length_);
+  pending_send_data_length_ = 0;
 }
 
 void SpdyWebSocketStream::OnClose(int status) {
   stream_.reset();
 
   // Destruction without Close() call OnClose() with delegate_ being NULL.
   if (!delegate_)
     return;
   Delegate* delegate = delegate_;
   delegate_ = NULL;
   delegate->OnCloseSpdyStream();
 }
 
 void SpdyWebSocketStream::OnSpdyStreamCreated(int result) {
   DCHECK_NE(ERR_IO_PENDING, result);
   if (result == OK) {
     stream_ = stream_request_.ReleaseStream();
     DCHECK(stream_);
     stream_->SetDelegate(this);
   }
   DCHECK(delegate_);
   delegate_->OnCreatedSpdyStream(result);
 }
 
 }  // namespace net