Index: net/quic/quic_packet_generator.cc |
diff --git a/net/quic/quic_packet_generator.cc b/net/quic/quic_packet_generator.cc |
index 785c94062b59d62c2d415854c97a647147def306..28017e942efd7e131c295e5dfef2e8827bf6f46d 100644 |
--- a/net/quic/quic_packet_generator.cc |
+++ b/net/quic/quic_packet_generator.cc |
@@ -29,7 +29,8 @@ QuicPacketGenerator::QuicPacketGenerator(DelegateInterface* delegate, |
QuicPacketGenerator::~QuicPacketGenerator() { |
for (QuicFrames::iterator it = queued_control_frames_.begin(); |
- it != queued_control_frames_.end(); ++it) { |
+ it != queued_control_frames_.end(); |
+ ++it) { |
switch (it->type) { |
case PADDING_FRAME: |
delete it->padding_frame; |
@@ -105,8 +106,8 @@ QuicConsumedData QuicPacketGenerator::ConsumeData(QuicStreamId id, |
IOVector data = data_to_write; |
size_t data_size = data.TotalBufferSize(); |
- while (delegate_->ShouldGeneratePacket(NOT_RETRANSMISSION, |
- HAS_RETRANSMITTABLE_DATA, handshake)) { |
+ while (delegate_->ShouldGeneratePacket( |
+ NOT_RETRANSMISSION, HAS_RETRANSMITTABLE_DATA, handshake)) { |
QuicFrame frame; |
size_t bytes_consumed; |
if (notifier != NULL) { |
@@ -161,12 +162,13 @@ bool QuicPacketGenerator::CanSendWithNextPendingFrameAddition() const { |
DCHECK(HasPendingFrames()); |
HasRetransmittableData retransmittable = |
(should_send_ack_ || should_send_feedback_ || should_send_stop_waiting_) |
- ? NO_RETRANSMITTABLE_DATA : HAS_RETRANSMITTABLE_DATA; |
+ ? NO_RETRANSMITTABLE_DATA |
+ : HAS_RETRANSMITTABLE_DATA; |
if (retransmittable == HAS_RETRANSMITTABLE_DATA) { |
- DCHECK(!queued_control_frames_.empty()); // These are retransmittable. |
+ DCHECK(!queued_control_frames_.empty()); // These are retransmittable. |
} |
- return delegate_->ShouldGeneratePacket(NOT_RETRANSMISSION, retransmittable, |
- NOT_HANDSHAKE); |
+ return delegate_->ShouldGeneratePacket( |
+ NOT_RETRANSMISSION, retransmittable, NOT_HANDSHAKE); |
} |
void QuicPacketGenerator::SendQueuedFrames(bool flush) { |
@@ -220,7 +222,7 @@ bool QuicPacketGenerator::HasQueuedFrames() const { |
bool QuicPacketGenerator::HasPendingFrames() const { |
return should_send_ack_ || should_send_feedback_ || |
- should_send_stop_waiting_ || !queued_control_frames_.empty(); |
+ should_send_stop_waiting_ || !queued_control_frames_.empty(); |
} |
bool QuicPacketGenerator::AddNextPendingFrame() { |