Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Side by Side Diff: net/spdy/buffered_spdy_framer.cc

Issue 786123002: Update from https://crrev.com/307330 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/spdy/buffered_spdy_framer.h ('k') | net/spdy/fuzzing/hpack_fuzz_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/spdy/buffered_spdy_framer.h" 5 #include "net/spdy/buffered_spdy_framer.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace net { 9 namespace net {
10 10
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 settings_ir.AddSetting( 329 settings_ir.AddSetting(
330 it->first, 330 it->first,
331 (it->second.first & SETTINGS_FLAG_PLEASE_PERSIST) != 0, 331 (it->second.first & SETTINGS_FLAG_PLEASE_PERSIST) != 0,
332 (it->second.first & SETTINGS_FLAG_PERSISTED) != 0, 332 (it->second.first & SETTINGS_FLAG_PERSISTED) != 0,
333 it->second.second); 333 it->second.second);
334 } 334 }
335 return spdy_framer_.SerializeSettings(settings_ir); 335 return spdy_framer_.SerializeSettings(settings_ir);
336 } 336 }
337 337
338 // TODO(jgraettinger): Eliminate uses of this method (prefer SpdyPingIR). 338 // TODO(jgraettinger): Eliminate uses of this method (prefer SpdyPingIR).
339 SpdyFrame* BufferedSpdyFramer::CreatePingFrame(uint32 unique_id, 339 SpdyFrame* BufferedSpdyFramer::CreatePingFrame(SpdyPingId unique_id,
340 bool is_ack) const { 340 bool is_ack) const {
341 SpdyPingIR ping_ir(unique_id); 341 SpdyPingIR ping_ir(unique_id);
342 ping_ir.set_is_ack(is_ack); 342 ping_ir.set_is_ack(is_ack);
343 return spdy_framer_.SerializePing(ping_ir); 343 return spdy_framer_.SerializePing(ping_ir);
344 } 344 }
345 345
346 // TODO(jgraettinger): Eliminate uses of this method (prefer SpdyGoAwayIR). 346 // TODO(jgraettinger): Eliminate uses of this method (prefer SpdyGoAwayIR).
347 SpdyFrame* BufferedSpdyFramer::CreateGoAway( 347 SpdyFrame* BufferedSpdyFramer::CreateGoAway(
348 SpdyStreamId last_accepted_stream_id, 348 SpdyStreamId last_accepted_stream_id,
349 SpdyGoAwayStatus status) const { 349 SpdyGoAwayStatus status) const {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 403
404 void BufferedSpdyFramer::InitHeaderStreaming(SpdyStreamId stream_id) { 404 void BufferedSpdyFramer::InitHeaderStreaming(SpdyStreamId stream_id) {
405 memset(header_buffer_, 0, kHeaderBufferSize); 405 memset(header_buffer_, 0, kHeaderBufferSize);
406 header_buffer_used_ = 0; 406 header_buffer_used_ = 0;
407 header_buffer_valid_ = true; 407 header_buffer_valid_ = true;
408 header_stream_id_ = stream_id; 408 header_stream_id_ = stream_id;
409 DCHECK_NE(header_stream_id_, SpdyFramer::kInvalidStream); 409 DCHECK_NE(header_stream_id_, SpdyFramer::kInvalidStream);
410 } 410 }
411 411
412 } // namespace net 412 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/buffered_spdy_framer.h ('k') | net/spdy/fuzzing/hpack_fuzz_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698