| Index: net/spdy/spdy_session.h
|
| diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
|
| index 53eda7446b369467cf072904a7a7625cbb92db29..edbe2f6f968dda6fa7894fb4113d4730b68f7596 100644
|
| --- a/net/spdy/spdy_session.h
|
| +++ b/net/spdy/spdy_session.h
|
| @@ -112,10 +112,10 @@ enum SpdyProtocolErrorDetails {
|
| // Next free value.
|
| NUM_SPDY_PROTOCOL_ERROR_DETAILS = 35,
|
| };
|
| -SpdyProtocolErrorDetails NET_EXPORT_PRIVATE MapFramerErrorToProtocolError(
|
| - SpdyFramer::SpdyError);
|
| -SpdyProtocolErrorDetails NET_EXPORT_PRIVATE MapRstStreamStatusToProtocolError(
|
| - SpdyRstStreamStatus);
|
| +SpdyProtocolErrorDetails NET_EXPORT_PRIVATE
|
| + MapFramerErrorToProtocolError(SpdyFramer::SpdyError);
|
| +SpdyProtocolErrorDetails NET_EXPORT_PRIVATE
|
| + MapRstStreamStatusToProtocolError(SpdyRstStreamStatus);
|
|
|
| // If these compile asserts fail then SpdyProtocolErrorDetails needs
|
| // to be updated with new values, as do the mapping functions above.
|
| @@ -233,9 +233,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| const HostPortProxyPair& host_port_proxy_pair() const {
|
| return spdy_session_key_.host_port_proxy_pair();
|
| }
|
| - const SpdySessionKey& spdy_session_key() const {
|
| - return spdy_session_key_;
|
| - }
|
| + const SpdySessionKey& spdy_session_key() const { return spdy_session_key_; }
|
| // Get a pushed stream for a given |url|. If the server initiates a
|
| // stream, it might already exist for a given path. The server
|
| // might also not have initiated the stream yet, but indicated it
|
| @@ -244,10 +242,9 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| // okay to create a new stream (in which case |spdy_stream| is
|
| // reset). Returns an error (not ERR_IO_PENDING) otherwise, and
|
| // resets |spdy_stream|.
|
| - int GetPushStream(
|
| - const GURL& url,
|
| - base::WeakPtr<SpdyStream>* spdy_stream,
|
| - const BoundNetLog& stream_net_log);
|
| + int GetPushStream(const GURL& url,
|
| + base::WeakPtr<SpdyStream>* spdy_stream,
|
| + const BoundNetLog& stream_net_log);
|
|
|
| // Initialize the session with the given connection. |is_secure|
|
| // must indicate whether |connection| uses an SSL socket or not; it
|
| @@ -292,11 +289,10 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| scoped_ptr<SpdyBufferProducer> producer);
|
|
|
| // Creates and returns a SYN frame for |stream_id|.
|
| - scoped_ptr<SpdyFrame> CreateSynStream(
|
| - SpdyStreamId stream_id,
|
| - RequestPriority priority,
|
| - SpdyControlFlags flags,
|
| - const SpdyHeaderBlock& headers);
|
| + scoped_ptr<SpdyFrame> CreateSynStream(SpdyStreamId stream_id,
|
| + RequestPriority priority,
|
| + SpdyControlFlags flags,
|
| + const SpdyHeaderBlock& headers);
|
|
|
| // Creates and returns a SpdyBuffer holding a data frame with the
|
| // given data. May return NULL if stalled by flow control.
|
| @@ -340,8 +336,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
|
|
| // Send a WINDOW_UPDATE frame for a stream. Called by a stream
|
| // whenever receive window size is increased.
|
| - void SendStreamWindowUpdate(SpdyStreamId stream_id,
|
| - uint32 delta_window_size);
|
| + void SendStreamWindowUpdate(SpdyStreamId stream_id, uint32 delta_window_size);
|
|
|
| // Whether the stream is closed, i.e. it has stopped processing data
|
| // and is about to be destroyed.
|
| @@ -377,9 +372,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
|
|
| // Returns true if the underlying transport socket ever had any reads or
|
| // writes.
|
| - bool WasEverUsed() const {
|
| - return connection_->socket()->WasEverUsed();
|
| - }
|
| + bool WasEverUsed() const { return connection_->socket()->WasEverUsed(); }
|
|
|
| // Returns the load timing information from the perspective of the given
|
| // stream. If it's not the first stream, the connection is considered reused
|
| @@ -401,7 +394,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| // available for testing and diagnostics.
|
| size_t num_active_streams() const { return active_streams_.size(); }
|
| size_t num_unclaimed_pushed_streams() const {
|
| - return unclaimed_pushed_streams_.size();
|
| + return unclaimed_pushed_streams_.size();
|
| }
|
| size_t num_created_streams() const { return created_streams_.size(); }
|
|
|
| @@ -412,9 +405,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| }
|
|
|
| // Returns the (version-dependent) flow control state.
|
| - FlowControlState flow_control_state() const {
|
| - return flow_control_state_;
|
| - }
|
| + FlowControlState flow_control_state() const { return flow_control_state_; }
|
|
|
| // Returns the current |stream_initial_send_window_size_|.
|
| int32 stream_initial_send_window_size() const {
|
| @@ -429,9 +420,8 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| // Returns true if no stream in the session can send data due to
|
| // session flow control.
|
| bool IsSendStalled() const {
|
| - return
|
| - flow_control_state_ == FLOW_CONTROL_STREAM_AND_SESSION &&
|
| - session_send_window_size_ == 0;
|
| + return flow_control_state_ == FLOW_CONTROL_STREAM_AND_SESSION &&
|
| + session_send_window_size_ == 0;
|
| }
|
|
|
| const BoundNetLog& net_log() const { return net_log_; }
|
| @@ -669,7 +659,8 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| void SendPrefacePing();
|
|
|
| // Send a single WINDOW_UPDATE frame.
|
| - void SendWindowUpdateFrame(SpdyStreamId stream_id, uint32 delta_window_size,
|
| + void SendWindowUpdateFrame(SpdyStreamId stream_id,
|
| + uint32 delta_window_size,
|
| RequestPriority priority);
|
|
|
| // Send the PING frame.
|
| @@ -802,8 +793,9 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| size_t len,
|
| bool fin) OVERRIDE;
|
| virtual void OnSettings(bool clear_persisted) OVERRIDE;
|
| - virtual void OnSetting(
|
| - SpdySettingsIds id, uint8 flags, uint32 value) OVERRIDE;
|
| + virtual void OnSetting(SpdySettingsIds id,
|
| + uint8 flags,
|
| + uint32 value) OVERRIDE;
|
| virtual void OnWindowUpdate(SpdyStreamId stream_id,
|
| uint32 delta_window_size) OVERRIDE;
|
| virtual void OnPushPromise(SpdyStreamId stream_id,
|
| @@ -814,25 +806,21 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| bool fin,
|
| bool unidirectional,
|
| const SpdyHeaderBlock& headers) OVERRIDE;
|
| - virtual void OnSynReply(
|
| - SpdyStreamId stream_id,
|
| - bool fin,
|
| - const SpdyHeaderBlock& headers) OVERRIDE;
|
| - virtual void OnHeaders(
|
| - SpdyStreamId stream_id,
|
| - bool fin,
|
| - const SpdyHeaderBlock& headers) OVERRIDE;
|
| + virtual void OnSynReply(SpdyStreamId stream_id,
|
| + bool fin,
|
| + const SpdyHeaderBlock& headers) OVERRIDE;
|
| + virtual void OnHeaders(SpdyStreamId stream_id,
|
| + bool fin,
|
| + const SpdyHeaderBlock& headers) OVERRIDE;
|
|
|
| // SpdyFramerDebugVisitorInterface
|
| - virtual void OnSendCompressedFrame(
|
| - SpdyStreamId stream_id,
|
| - SpdyFrameType type,
|
| - size_t payload_len,
|
| - size_t frame_len) OVERRIDE;
|
| - virtual void OnReceiveCompressedFrame(
|
| - SpdyStreamId stream_id,
|
| - SpdyFrameType type,
|
| - size_t frame_len) OVERRIDE;
|
| + virtual void OnSendCompressedFrame(SpdyStreamId stream_id,
|
| + SpdyFrameType type,
|
| + size_t payload_len,
|
| + size_t frame_len) OVERRIDE;
|
| + virtual void OnReceiveCompressedFrame(SpdyStreamId stream_id,
|
| + SpdyFrameType type,
|
| + size_t frame_len) OVERRIDE;
|
|
|
| // Called when bytes are consumed from a SpdyBuffer for a DATA frame
|
| // that is to be written or is being written. Increases the send
|
|
|
Chromium Code Reviews
