| Index: net/quic/quic_headers_stream.cc
|
| diff --git a/net/quic/quic_headers_stream.cc b/net/quic/quic_headers_stream.cc
|
| index 56b700e9a40c2a08af1595509c51252bbe2bfac9..b99e9d21683260c6379e04abb3f2018c2cedf600 100644
|
| --- a/net/quic/quic_headers_stream.cc
|
| +++ b/net/quic/quic_headers_stream.cc
|
| @@ -26,11 +26,11 @@ class QuicHeadersStream::SpdyFramerVisitor
|
| explicit SpdyFramerVisitor(QuicHeadersStream* stream) : stream_(stream) {}
|
|
|
| // SpdyFramerVisitorInterface implementation
|
| - virtual void OnSynStream(SpdyStreamId stream_id,
|
| - SpdyStreamId associated_stream_id,
|
| - SpdyPriority priority,
|
| - bool fin,
|
| - bool unidirectional) override {
|
| + void OnSynStream(SpdyStreamId stream_id,
|
| + SpdyStreamId associated_stream_id,
|
| + SpdyPriority priority,
|
| + bool fin,
|
| + bool unidirectional) override {
|
| if (!stream_->IsConnected()) {
|
| return;
|
| }
|
| @@ -48,7 +48,7 @@ class QuicHeadersStream::SpdyFramerVisitor
|
| stream_->OnSynStream(stream_id, priority, fin);
|
| }
|
|
|
| - virtual void OnSynReply(SpdyStreamId stream_id, bool fin) override {
|
| + void OnSynReply(SpdyStreamId stream_id, bool fin) override {
|
| if (!stream_->IsConnected()) {
|
| return;
|
| }
|
| @@ -56,9 +56,9 @@ class QuicHeadersStream::SpdyFramerVisitor
|
| stream_->OnSynReply(stream_id, fin);
|
| }
|
|
|
| - virtual bool OnControlFrameHeaderData(SpdyStreamId stream_id,
|
| - const char* header_data,
|
| - size_t len) override {
|
| + bool OnControlFrameHeaderData(SpdyStreamId stream_id,
|
| + const char* header_data,
|
| + size_t len) override {
|
| if (!stream_->IsConnected()) {
|
| return false;
|
| }
|
| @@ -66,10 +66,10 @@ class QuicHeadersStream::SpdyFramerVisitor
|
| return true;
|
| }
|
|
|
| - virtual void OnStreamFrameData(SpdyStreamId stream_id,
|
| - const char* data,
|
| - size_t len,
|
| - bool fin) override {
|
| + void OnStreamFrameData(SpdyStreamId stream_id,
|
| + const char* data,
|
| + size_t len,
|
| + bool fin) override {
|
| if (fin && len == 0) {
|
| // The framer invokes OnStreamFrameData with zero-length data and
|
| // fin = true after processing a SYN_STREAM or SYN_REPLY frame
|
| @@ -79,78 +79,76 @@ class QuicHeadersStream::SpdyFramerVisitor
|
| CloseConnection("SPDY DATA frame received.");
|
| }
|
|
|
| - virtual void OnError(SpdyFramer* framer) override {
|
| + void OnError(SpdyFramer* framer) override {
|
| CloseConnection("SPDY framing error.");
|
| }
|
|
|
| - virtual void OnDataFrameHeader(SpdyStreamId stream_id,
|
| - size_t length,
|
| - bool fin) override {
|
| + void OnDataFrameHeader(SpdyStreamId stream_id,
|
| + size_t length,
|
| + bool fin) override {
|
| CloseConnection("SPDY DATA frame received.");
|
| }
|
|
|
| - virtual void OnRstStream(SpdyStreamId stream_id,
|
| - SpdyRstStreamStatus status) override {
|
| + void OnRstStream(SpdyStreamId stream_id,
|
| + SpdyRstStreamStatus status) override {
|
| CloseConnection("SPDY RST_STREAM frame received.");
|
| }
|
|
|
| - virtual void OnSetting(SpdySettingsIds id,
|
| - uint8 flags,
|
| - uint32 value) override {
|
| + void OnSetting(SpdySettingsIds id, uint8 flags, uint32 value) override {
|
| CloseConnection("SPDY SETTINGS frame received.");
|
| }
|
|
|
| - virtual void OnSettingsAck() override {
|
| + void OnSettingsAck() override {
|
| CloseConnection("SPDY SETTINGS frame received.");
|
| }
|
|
|
| - virtual void OnSettingsEnd() override {
|
| + void OnSettingsEnd() override {
|
| CloseConnection("SPDY SETTINGS frame received.");
|
| }
|
|
|
| - virtual void OnPing(SpdyPingId unique_id, bool is_ack) override {
|
| + void OnPing(SpdyPingId unique_id, bool is_ack) override {
|
| CloseConnection("SPDY PING frame received.");
|
| }
|
|
|
| - virtual void OnGoAway(SpdyStreamId last_accepted_stream_id,
|
| - SpdyGoAwayStatus status) override {
|
| + void OnGoAway(SpdyStreamId last_accepted_stream_id,
|
| + SpdyGoAwayStatus status) override {
|
| CloseConnection("SPDY GOAWAY frame received.");
|
| }
|
|
|
| - virtual void OnHeaders(SpdyStreamId stream_id, bool fin, bool end) override {
|
| + void OnHeaders(SpdyStreamId stream_id, bool fin, bool end) override {
|
| CloseConnection("SPDY HEADERS frame received.");
|
| }
|
|
|
| - virtual void OnWindowUpdate(SpdyStreamId stream_id,
|
| - uint32 delta_window_size) override {
|
| + void OnWindowUpdate(SpdyStreamId stream_id,
|
| + uint32 delta_window_size) override {
|
| CloseConnection("SPDY WINDOW_UPDATE frame received.");
|
| }
|
|
|
| - virtual void OnPushPromise(SpdyStreamId stream_id,
|
| - SpdyStreamId promised_stream_id,
|
| - bool end) override {
|
| + void OnPushPromise(SpdyStreamId stream_id,
|
| + SpdyStreamId promised_stream_id,
|
| + bool end) override {
|
| LOG(DFATAL) << "PUSH_PROMISE frame received from a SPDY/3 framer";
|
| CloseConnection("SPDY PUSH_PROMISE frame received.");
|
| }
|
|
|
| - virtual void OnContinuation(SpdyStreamId stream_id, bool end) override {
|
| + void OnContinuation(SpdyStreamId stream_id, bool end) override {
|
| CloseConnection("SPDY CONTINUATION frame received.");
|
| }
|
|
|
| - virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) override {
|
| + bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) override {
|
| CloseConnection("SPDY unknown frame received.");
|
| return false;
|
| }
|
|
|
| // SpdyFramerDebugVisitorInterface implementation
|
| - 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 {
|
| if (stream_->IsConnected()) {
|
| stream_->OnCompressedFrameSize(frame_len);
|
| }
|
|
|