| Index: net/spdy/buffered_spdy_framer.cc
|
| diff --git a/net/spdy/buffered_spdy_framer.cc b/net/spdy/buffered_spdy_framer.cc
|
| index 825d9c5043f022c6af07129d0d384149526775db..507456961ca544182d3ceae8bf702ea23e1ad1bb 100644
|
| --- a/net/spdy/buffered_spdy_framer.cc
|
| +++ b/net/spdy/buffered_spdy_framer.cc
|
| @@ -75,9 +75,7 @@ void BufferedSpdyFramer::OnSynStream(SpdyStreamId stream_id,
|
| InitHeaderStreaming(stream_id);
|
| }
|
|
|
| -void BufferedSpdyFramer::OnHeaders(SpdyStreamId stream_id,
|
| - bool fin,
|
| - bool end) {
|
| +void BufferedSpdyFramer::OnHeaders(SpdyStreamId stream_id, bool fin, bool end) {
|
| frames_received_++;
|
| DCHECK(!control_frame_fields_.get());
|
| control_frame_fields_.reset(new ControlFrameFields());
|
| @@ -88,8 +86,7 @@ void BufferedSpdyFramer::OnHeaders(SpdyStreamId stream_id,
|
| InitHeaderStreaming(stream_id);
|
| }
|
|
|
| -void BufferedSpdyFramer::OnSynReply(SpdyStreamId stream_id,
|
| - bool fin) {
|
| +void BufferedSpdyFramer::OnSynReply(SpdyStreamId stream_id, bool fin) {
|
| frames_received_++;
|
| DCHECK(!control_frame_fields_.get());
|
| control_frame_fields_.reset(new ControlFrameFields());
|
| @@ -115,8 +112,8 @@ bool BufferedSpdyFramer::OnControlFrameHeaderData(SpdyStreamId stream_id,
|
| // TODO(rch): this really should be checking parsed_len != len,
|
| // but a bunch of tests fail. Need to figure out why.
|
| if (parsed_len == 0) {
|
| - visitor_->OnStreamError(
|
| - stream_id, "Could not parse Spdy Control Frame Header.");
|
| + visitor_->OnStreamError(stream_id,
|
| + "Could not parse Spdy Control Frame Header.");
|
| return false;
|
| }
|
| DCHECK(control_frame_fields_.get());
|
| @@ -151,8 +148,8 @@ bool BufferedSpdyFramer::OnControlFrameHeaderData(SpdyStreamId stream_id,
|
| const size_t available = kHeaderBufferSize - header_buffer_used_;
|
| if (len > available) {
|
| header_buffer_valid_ = false;
|
| - visitor_->OnStreamError(
|
| - stream_id, "Received more data than the allocated size.");
|
| + visitor_->OnStreamError(stream_id,
|
| + "Received more data than the allocated size.");
|
| return false;
|
| }
|
| memcpy(header_buffer_ + header_buffer_used_, header_data, len);
|
| @@ -269,10 +266,9 @@ SpdyFrame* BufferedSpdyFramer::CreateSynStream(
|
|
|
| // TODO(jgraettinger): Eliminate uses of this method (prefer
|
| // SpdySynReplyIR).
|
| -SpdyFrame* BufferedSpdyFramer::CreateSynReply(
|
| - SpdyStreamId stream_id,
|
| - SpdyControlFlags flags,
|
| - const SpdyHeaderBlock* headers) {
|
| +SpdyFrame* BufferedSpdyFramer::CreateSynReply(SpdyStreamId stream_id,
|
| + SpdyControlFlags flags,
|
| + const SpdyHeaderBlock* headers) {
|
| SpdySynReplyIR syn_reply(stream_id);
|
| syn_reply.set_fin(flags & CONTROL_FLAG_FIN);
|
| // TODO(hkhalil): Avoid copy here.
|
| @@ -291,11 +287,9 @@ SpdyFrame* BufferedSpdyFramer::CreateRstStream(
|
|
|
| // TODO(jgraettinger): Eliminate uses of this method (prefer
|
| // SpdySettingsIR).
|
| -SpdyFrame* BufferedSpdyFramer::CreateSettings(
|
| - const SettingsMap& values) const {
|
| +SpdyFrame* BufferedSpdyFramer::CreateSettings(const SettingsMap& values) const {
|
| SpdySettingsIR settings_ir;
|
| - for (SettingsMap::const_iterator it = values.begin();
|
| - it != values.end();
|
| + for (SettingsMap::const_iterator it = values.begin(); it != values.end();
|
| ++it) {
|
| settings_ir.AddSetting(
|
| it->first,
|
| @@ -323,10 +317,9 @@ SpdyFrame* BufferedSpdyFramer::CreateGoAway(
|
| }
|
|
|
| // TODO(jgraettinger): Eliminate uses of this method (prefer SpdyHeadersIR).
|
| -SpdyFrame* BufferedSpdyFramer::CreateHeaders(
|
| - SpdyStreamId stream_id,
|
| - SpdyControlFlags flags,
|
| - const SpdyHeaderBlock* headers) {
|
| +SpdyFrame* BufferedSpdyFramer::CreateHeaders(SpdyStreamId stream_id,
|
| + SpdyControlFlags flags,
|
| + const SpdyHeaderBlock* headers) {
|
| SpdyHeadersIR headers_ir(stream_id);
|
| headers_ir.set_fin((flags & CONTROL_FLAG_FIN) != 0);
|
| headers_ir.set_name_value_block(*headers);
|
| @@ -347,8 +340,7 @@ SpdyFrame* BufferedSpdyFramer::CreateDataFrame(SpdyStreamId stream_id,
|
| const char* data,
|
| uint32 len,
|
| SpdyDataFlags flags) {
|
| - SpdyDataIR data_ir(stream_id,
|
| - base::StringPiece(data, len));
|
| + SpdyDataIR data_ir(stream_id, base::StringPiece(data, len));
|
| data_ir.set_fin((flags & DATA_FLAG_FIN) != 0);
|
| return spdy_framer_.SerializeData(data_ir);
|
| }
|
|
|