| Index: net/quic/quic_framer.cc
|
| diff --git a/net/quic/quic_framer.cc b/net/quic/quic_framer.cc
|
| index 208dd81f344650b32737d1b8b9dc1745fd707763..c01b7f29234dd908d113f958acccc3092d51c4cf 100644
|
| --- a/net/quic/quic_framer.cc
|
| +++ b/net/quic/quic_framer.cc
|
| @@ -173,7 +173,6 @@ size_t QuicFramer::GetMinStreamFrameSize(QuicStreamId stream_id,
|
|
|
| // static
|
| size_t QuicFramer::GetMinAckFrameSize(
|
| - QuicSequenceNumberLength sequence_number_length,
|
| QuicSequenceNumberLength largest_observed_length) {
|
| return kQuicFrameTypeSize + kQuicEntropyHashSize +
|
| largest_observed_length + kQuicDeltaTimeLargestObservedSize;
|
| @@ -301,9 +300,9 @@ size_t QuicFramer::GetSerializedFrameLength(
|
| if (!first_frame) {
|
| return 0;
|
| }
|
| - bool can_truncate = frame.type == ACK_FRAME &&
|
| - free_bytes >= GetMinAckFrameSize(PACKET_6BYTE_SEQUENCE_NUMBER,
|
| - PACKET_6BYTE_SEQUENCE_NUMBER);
|
| + bool can_truncate =
|
| + frame.type == ACK_FRAME &&
|
| + free_bytes >= GetMinAckFrameSize(PACKET_6BYTE_SEQUENCE_NUMBER);
|
| if (can_truncate) {
|
| // Truncate the frame so the packet will not exceed kMaxPacketSize.
|
| // Note that we may not use every byte of the writer in this case.
|
| @@ -1728,8 +1727,7 @@ size_t QuicFramer::GetAckFrameSize(
|
| QuicSequenceNumberLength missing_sequence_number_length =
|
| GetMinSequenceNumberLength(ack_info.max_delta);
|
|
|
| - size_t ack_size = GetMinAckFrameSize(sequence_number_length,
|
| - largest_observed_length);
|
| + size_t ack_size = GetMinAckFrameSize(largest_observed_length);
|
| if (!ack_info.nack_ranges.empty()) {
|
| ack_size += kNumberOfNackRangesSize + kNumberOfRevivedPacketsSize;
|
| ack_size += min(ack_info.nack_ranges.size(), kMaxNackRanges) *
|
| @@ -1919,10 +1917,9 @@ bool QuicFramer::AppendAckFrameAndTypeByte(
|
| QuicSequenceNumberLength missing_sequence_number_length =
|
| GetMinSequenceNumberLength(ack_info.max_delta);
|
| // Determine whether we need to truncate ranges.
|
| - size_t available_range_bytes = writer->capacity() - writer->length() -
|
| - kNumberOfRevivedPacketsSize - kNumberOfNackRangesSize -
|
| - GetMinAckFrameSize(header.public_header.sequence_number_length,
|
| - largest_observed_length);
|
| + size_t available_range_bytes =
|
| + writer->capacity() - writer->length() - kNumberOfRevivedPacketsSize -
|
| + kNumberOfNackRangesSize - GetMinAckFrameSize(largest_observed_length);
|
| size_t max_num_ranges = available_range_bytes /
|
| (missing_sequence_number_length + PACKET_1BYTE_SEQUENCE_NUMBER);
|
| max_num_ranges = min(kMaxNackRanges, max_num_ranges);
|
|
|