[SPDY] Remove SpdyStream::Delegate::OnSendBody()'s return value

net/spdy/spdy_stream.h

 // 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.
 
 #ifndef NET_SPDY_SPDY_STREAM_H_
 #define NET_SPDY_SPDY_STREAM_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 42 matching lines @@
  public:
   // Delegate handles protocol specific behavior of spdy stream.
   class NET_EXPORT_PRIVATE Delegate {
    public:
     Delegate() {}
 
     // Called when SYN frame has been sent.
     // Returns true if no more data to be sent after SYN frame.
     virtual SpdySendStatus OnSendHeadersComplete() = 0;
 
-    // Called when stream is ready to send data.
-    // Returns network error code. OK when it successfully sent data.
-    // ERR_IO_PENDING when performing operation asynchronously.
-    virtual int OnSendBody() = 0;
+    // Called when the stream is ready to send body data.  The
+    // delegate must call QueueStreamData() on the stream, either
+    // immediately or asynchronously (e.g., if the data to be send has
+    // to be read asynchronously). Must return ERR_IO_PENDING.

[Ryan Hamilton, 2013/05/22 03:17:30]

Looks like it's now void

[akalin, 2013/05/22 08:40:05]

Done.

+    //
+    // Called only when OnSendHeadersComplete() or
+    // OnSendBodyComplete() returns MORE_DATA_TO_SEND.
+    //
+    // TODO(akalin): Remove the return value.

[Ryan Hamilton, 2013/05/22 03:17:30]

I think you removed the return value, didn't you?

[akalin, 2013/05/22 08:40:05]

Done.

+    virtual void OnSendBody() = 0;
 
     // Called when body data has been sent. |bytes_sent| is the number
     // of bytes that has been sent (may be zero). Must return whether
     // there's more body data to send.
     virtual SpdySendStatus OnSendBodyComplete(size_t bytes_sent) = 0;
 
     // Called when the SYN_STREAM, SYN_REPLY, or HEADERS frames are received.
     // Normal streams will receive a SYN_REPLY and optional HEADERS frames.
     // Pushed streams will receive a SYN_STREAM and optional HEADERS frames.
     // Because a stream may have a SYN_* frame and multiple HEADERS frames,
@@ skipping 279 matching lines @@
   // Try to make progress sending/receiving the request/response.
   int DoLoop(int result);
 
   // The implementations of each state of the state machine.
   int DoGetDomainBoundCert();
   int DoGetDomainBoundCertComplete(int result);
   int DoSendDomainBoundCert();
   int DoSendDomainBoundCertComplete(int result);
   int DoSendHeaders();
   int DoSendHeadersComplete();
-  int DoSendBody();
+  void DoSendBody();

[Ryan Hamilton, 2013/05/22 03:17:30]

I don't think this is a good idea.  The pattern we use for state machines is
that each step returns the result from that step... even if it's always OK or
always ERR_IO_PENDING.

[akalin, 2013/05/22 08:40:05]

Done.

   int DoSendBodyComplete(int result);
   int DoReadHeaders();
   int DoReadHeadersComplete(int result);
   int DoOpen();
 
   // Update the histograms.  Can safely be called repeatedly, but should only
   // be called after the stream has completed.
   void UpdateHistograms();
 
   // When a server pushed stream is first created, this function is posted on
@@ skipping 80 matching lines @@
   // When OnFrameWriteComplete() is called, these variables are set.
   SpdyFrameType just_completed_frame_type_;
   size_t just_completed_frame_size_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdyStream);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_STREAM_H_