| Index: net/spdy/spdy_session.h
|
| diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
|
| index cbb87bf8c611affa509e8da5024c19daadc5696a..203f1ef052f0b1cfb10da672279bf0f38622c374 100644
|
| --- a/net/spdy/spdy_session.h
|
| +++ b/net/spdy/spdy_session.h
|
| @@ -256,13 +256,13 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| // |certificate_error_code| must either be OK or less than
|
| // ERR_IO_PENDING.
|
| //
|
| - // Returns OK on success, or an error on failure. Never returns
|
| - // ERR_IO_PENDING. If an error is returned, the session must be
|
| - // destroyed immediately.
|
| - Error InitializeWithSocket(scoped_ptr<ClientSocketHandle> connection,
|
| - SpdySessionPool* pool,
|
| - bool is_secure,
|
| - int certificate_error_code);
|
| + // The session begins reading from |connection| on a subsequent event loop
|
| + // iteration, so the SpdySession may close immediately afterwards if the first
|
| + // read of |connection| fails.
|
| + void InitializeWithSocket(scoped_ptr<ClientSocketHandle> connection,
|
| + SpdySessionPool* pool,
|
| + bool is_secure,
|
| + int certificate_error_code);
|
|
|
| // Returns the protocol used by this session. Always between
|
| // kProtoSPDYMinimumVersion and kProtoSPDYMaximumVersion.
|
| @@ -367,7 +367,8 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| base::Value* GetInfoAsValue() const;
|
|
|
| // Indicates whether the session is being reused after having successfully
|
| - // used to send/receive data in the past.
|
| + // used to send/receive data in the past or if the underlying socket was idle
|
| + // before being used for a SPDY session.
|
| bool IsReused() const;
|
|
|
| // Returns true if the underlying transport socket ever had any reads or
|
| @@ -617,8 +618,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| // Advance the ReadState state machine. |expected_read_state| is the
|
| // expected starting read state.
|
| //
|
| - // This function must always be called via PumpReadLoop() except for
|
| - // from InitializeWithSocket().
|
| + // This function must always be called via PumpReadLoop().
|
| int DoReadLoop(ReadState expected_read_state, int result);
|
| // The implementations of the states of the ReadState state machine.
|
| int DoRead();
|
|
|