| Index: net/spdy/spdy_session.h
|
| diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
|
| index 293ed2b3232be875521142cf90c763d762f5630a..ef2d8fe12aef54d1a1c57a36fd146dc9771457a0 100644
|
| --- a/net/spdy/spdy_session.h
|
| +++ b/net/spdy/spdy_session.h
|
| @@ -250,7 +250,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| const HostPortPair& trusted_spdy_proxy,
|
| NetLog* net_log);
|
|
|
| - virtual ~SpdySession();
|
| + ~SpdySession() override;
|
|
|
| const HostPortPair& host_port_pair() const {
|
| return spdy_session_key_.host_port_proxy_pair().first;
|
| @@ -517,7 +517,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| base::WeakPtr<SpdySession> GetWeakPtr();
|
|
|
| // HigherLayeredPool implementation:
|
| - virtual bool CloseOneIdleConnection() override;
|
| + bool CloseOneIdleConnection() override;
|
|
|
| private:
|
| friend class base::RefCounted<SpdySession>;
|
| @@ -813,55 +813,49 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| void DeleteExpiredPushedStreams();
|
|
|
| // BufferedSpdyFramerVisitorInterface:
|
| - virtual void OnError(SpdyFramer::SpdyError error_code) override;
|
| - virtual void OnStreamError(SpdyStreamId stream_id,
|
| - const std::string& description) override;
|
| - virtual void OnPing(SpdyPingId unique_id, bool is_ack) override;
|
| - virtual void OnRstStream(SpdyStreamId stream_id,
|
| - SpdyRstStreamStatus status) override;
|
| - virtual void OnGoAway(SpdyStreamId last_accepted_stream_id,
|
| - SpdyGoAwayStatus status) override;
|
| - virtual void OnDataFrameHeader(SpdyStreamId stream_id,
|
| - size_t length,
|
| - bool fin) override;
|
| - virtual void OnStreamFrameData(SpdyStreamId stream_id,
|
| - const char* data,
|
| - 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 OnWindowUpdate(SpdyStreamId stream_id,
|
| - uint32 delta_window_size) override;
|
| - virtual void OnPushPromise(SpdyStreamId stream_id,
|
| - SpdyStreamId promised_stream_id,
|
| - const SpdyHeaderBlock& headers) override;
|
| - virtual void OnSynStream(SpdyStreamId stream_id,
|
| - SpdyStreamId associated_stream_id,
|
| - SpdyPriority priority,
|
| - 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 bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) override;
|
| + void OnError(SpdyFramer::SpdyError error_code) override;
|
| + void OnStreamError(SpdyStreamId stream_id,
|
| + const std::string& description) override;
|
| + void OnPing(SpdyPingId unique_id, bool is_ack) override;
|
| + void OnRstStream(SpdyStreamId stream_id, SpdyRstStreamStatus status) override;
|
| + void OnGoAway(SpdyStreamId last_accepted_stream_id,
|
| + SpdyGoAwayStatus status) override;
|
| + void OnDataFrameHeader(SpdyStreamId stream_id,
|
| + size_t length,
|
| + bool fin) override;
|
| + void OnStreamFrameData(SpdyStreamId stream_id,
|
| + const char* data,
|
| + size_t len,
|
| + bool fin) override;
|
| + void OnSettings(bool clear_persisted) override;
|
| + void OnSetting(SpdySettingsIds id, uint8 flags, uint32 value) override;
|
| + void OnWindowUpdate(SpdyStreamId stream_id,
|
| + uint32 delta_window_size) override;
|
| + void OnPushPromise(SpdyStreamId stream_id,
|
| + SpdyStreamId promised_stream_id,
|
| + const SpdyHeaderBlock& headers) override;
|
| + void OnSynStream(SpdyStreamId stream_id,
|
| + SpdyStreamId associated_stream_id,
|
| + SpdyPriority priority,
|
| + bool fin,
|
| + bool unidirectional,
|
| + const SpdyHeaderBlock& headers) override;
|
| + void OnSynReply(SpdyStreamId stream_id,
|
| + bool fin,
|
| + const SpdyHeaderBlock& headers) override;
|
| + void OnHeaders(SpdyStreamId stream_id,
|
| + bool fin,
|
| + const SpdyHeaderBlock& headers) override;
|
| + bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) 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;
|
| + void OnSendCompressedFrame(SpdyStreamId stream_id,
|
| + SpdyFrameType type,
|
| + size_t payload_len,
|
| + size_t frame_len) override;
|
| + 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
|
|
|