SPDY - chunked upload - speech recognition doesn't work with SPDY/3

net/spdy/spdy_http_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_HTTP_STREAM_H_
 #define NET_SPDY_SPDY_HTTP_STREAM_H_
 #pragma once
 
 #include <list>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_log.h"
+#include "net/base/upload_data.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_stream.h"
 #include "net/spdy/spdy_protocol.h"
 #include "net/spdy/spdy_session.h"
 #include "net/spdy/spdy_stream.h"
 
 namespace net {
 
 class DrainableIOBuffer;
 class HttpResponseInfo;
 class IOBuffer;
 class SpdySession;
 class UploadData;
 class UploadDataStream;
 
 // The SpdyHttpStream is a HTTP-specific type of stream known to a SpdySession.
 class NET_EXPORT_PRIVATE SpdyHttpStream : public SpdyStream::Delegate,
-                                          public HttpStream {
+                                          public HttpStream,
+                                          public ChunkCallback {
  public:
   SpdyHttpStream(SpdySession* spdy_session, bool direct);
   virtual ~SpdyHttpStream();
 
   // Initializes this SpdyHttpStream by wrapping an existing SpdyStream.
   void InitializeWithExistingStream(SpdyStream* spdy_stream);
 
   SpdyStream* stream() { return stream_.get(); }
 
   // Cancels any callbacks from being invoked and deletes the stream.
@@ skipping 31 matching lines @@
   // SpdyStream::Delegate implementation.
   virtual bool OnSendHeadersComplete(int status) OVERRIDE;
   virtual int OnSendBody() OVERRIDE;
   virtual int OnSendBodyComplete(int status, bool* eof) OVERRIDE;
   virtual int OnResponseReceived(const SpdyHeaderBlock& response,
                                  base::Time response_time,
                                  int status) OVERRIDE;
   virtual void OnDataReceived(const char* buffer, int bytes) OVERRIDE;
   virtual void OnDataSent(int length) OVERRIDE;
   virtual void OnClose(int status) OVERRIDE;
-  virtual void set_chunk_callback(ChunkCallback* callback) OVERRIDE;
+
+  // ChunkCallback implementation.
+  virtual void OnChunkAvailable() OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test,
                            FlowControlStallResume);
   FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy3Test,
                            FlowControlStallResume);
   FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy3Test,
                            FlowControlStallResumeAfterSettings);
   FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy3Test,
                            FlowControlNegativeSendWindowSize);
 
+  // Reads the data (whether chunked or not) from the request body stream and
+  // sends the data by calling WriteStreamData on the underlying SpdyStream
+  // (which always returns ERR_IO_PENDING). In the case of chunked uploads, if

[Ryan Hamilton, 2012/07/11 21:08:21]

I'm not sure that you need any of this comment after "underlying SpdyStream",
(with the possible exception of "This method always returns ERR_IO_PENDING"
though that is only true as long as the implementation of
SpdyStream::WriteStreamData does not change.)

sleevi, what do you think?

[Ryan Sleevi, 2012/07/11 21:13:46]

Sounds good - I agree that we don't want to document SpdyStream's behaviour in
this header "(which always returns)", nor do I think we should say "This method
always returns"

Just documenting how this method behaves, and everything else is unspecified/as
implemented by the underlying SpdyStream.

[ramant (doing other things), 2012/07/11 22:02:21]

Done.

+  // data is not available, returns ERR_IO_PENDING, and the write will be
+  // completed at a later time. This method always returns ERR_IO_PENDING.
+  int SendData();
+
   // Call the user callback.
   void DoCallback(int rv);
 
   void ScheduleBufferedReadCallback();
 
   // Returns true if the callback is invoked.
   bool DoBufferedReadCallback();
   bool ShouldWaitForMoreBufferedData() const;
 
   base::WeakPtrFactory<SpdyHttpStream> weak_factory_;
@@ skipping 32 matching lines @@
 
   // Is there a scheduled read callback pending.
   bool buffered_read_callback_pending_;
   // Has more data been received from the network during the wait for the
   // scheduled read callback.
   bool more_read_data_pending_;
 
   // Is this spdy stream direct to the origin server (or to a proxy).
   bool direct_;
 
+  // Is the connection stalled waiting for an upload data chunk.
+  bool waiting_for_chunk_;
+
   bool send_last_chunk_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdyHttpStream);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_HTTP_STREAM_H_