| Index: net/spdy/spdy_stream.h
|
| diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h
|
| index d96e5e910895eabff0d7a0d86706e002a034a7f0..912def1219ccb047e16ad7dc1c0a850539ce9cc6 100644
|
| --- a/net/spdy/spdy_stream.h
|
| +++ b/net/spdy/spdy_stream.h
|
| @@ -291,10 +291,9 @@ class NET_EXPORT_PRIVATE SpdyStream {
|
| base::Time GetRequestTime() const;
|
| void SetRequestTime(base::Time t);
|
|
|
| - // Called at most once by the SpdySession when the initial response
|
| - // headers have been received for this stream, i.e., a SYN_REPLY (or
|
| - // SYN_STREAM for push streams) frame has been received. Returns a status
|
| - // code; if it is an error, the stream was closed by this function.
|
| + // Called at most once by the SpdySession when the initial response headers
|
| + // have been received for this stream. Returns a status code; if it is an
|
| + // error, the stream was closed by this function.
|
| int OnInitialResponseHeadersReceived(const SpdyHeaderBlock& response_headers,
|
| base::Time response_time,
|
| base::TimeTicks recv_first_byte_time);
|
| @@ -333,7 +332,7 @@ class NET_EXPORT_PRIVATE SpdyStream {
|
| // of the HEADERS or PUSH_PROMISE frame and subsequent CONTINUATION frames.
|
| void OnFrameWriteComplete(SpdyFrameType frame_type, size_t frame_size);
|
|
|
| - // SYN_STREAM-specific write handler invoked by OnFrameWriteComplete().
|
| + // HEADERS-specific write handler invoked by OnFrameWriteComplete().
|
| int OnRequestHeadersSent();
|
|
|
| // DATA-specific write handler invoked by OnFrameWriteComplete().
|
| @@ -432,14 +431,13 @@ class NET_EXPORT_PRIVATE SpdyStream {
|
| const GURL& GetUrlFromHeaders() const { return url_from_header_block_; }
|
|
|
| private:
|
| - class SynStreamBufferProducer;
|
| - class HeaderBufferProducer;
|
| + class HeadersBufferProducer;
|
|
|
| // SpdyStream states and transitions are modeled
|
| // on the HTTP/2 stream state machine. All states and transitions
|
| // are modeled, with the exceptions of RESERVED_LOCAL (the client
|
| // cannot initate push streams), and the transition to OPEN due to
|
| - // a remote SYN_STREAM (the client can only initate streams).
|
| + // a remote HEADERS (the client can only initate streams).
|
| enum State {
|
| STATE_IDLE,
|
| STATE_OPEN,
|
| @@ -463,9 +461,9 @@ class NET_EXPORT_PRIVATE SpdyStream {
|
| // to have occurred, driving the state machine forward.
|
| void PushedStreamReplay();
|
|
|
| - // Produces the SYN_STREAM frame for the stream. The stream must
|
| + // Produces the HEADERS frame for the stream. The stream must
|
| // already be activated.
|
| - std::unique_ptr<SpdySerializedFrame> ProduceSynStreamFrame();
|
| + std::unique_ptr<SpdySerializedFrame> ProduceHeadersFrame();
|
|
|
| // Queues the send for next frame of the remaining data in
|
| // |pending_send_data_|. Must be called only when
|
|
|