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

Unified Diff: net/quic/core/quic_unacked_packet_map.cc

Issue 2535753006: Remove unnecessary (and incorrectly named) MaybeRemoveTransmittableFrames method. No behavior chang… (Closed)
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/core/quic_unacked_packet_map.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/quic_unacked_packet_map.cc
diff --git a/net/quic/core/quic_unacked_packet_map.cc b/net/quic/core/quic_unacked_packet_map.cc
index 7dc5a853280e94884e3eea50030900aa7ecd26a7..e5a069674f78fe30dfed6ccfb722058b6a30dc10 100644
--- a/net/quic/core/quic_unacked_packet_map.cc
+++ b/net/quic/core/quic_unacked_packet_map.cc
@@ -150,7 +150,14 @@ void QuicUnackedPacketMap::RemoveRetransmittability(
info->retransmission = 0;
info = &unacked_packets_[retransmission - least_unacked_];
}
- MaybeRemoveRetransmittableFrames(info);
+
+ if (info->has_crypto_handshake) {
+ DCHECK(!info->retransmittable_frames.empty());
+ DCHECK_LT(0u, pending_crypto_packet_count_);
+ --pending_crypto_packet_count_;
+ info->has_crypto_handshake = false;
+ }
+ DeleteFrames(&info->retransmittable_frames);
}
void QuicUnackedPacketMap::RemoveRetransmittability(
@@ -162,17 +169,6 @@ void QuicUnackedPacketMap::RemoveRetransmittability(
RemoveRetransmittability(info);
}
-void QuicUnackedPacketMap::MaybeRemoveRetransmittableFrames(
- QuicTransmissionInfo* transmission_info) {
- if (transmission_info->has_crypto_handshake) {
- DCHECK(!transmission_info->retransmittable_frames.empty());
- DCHECK_LT(0u, pending_crypto_packet_count_);
- --pending_crypto_packet_count_;
- transmission_info->has_crypto_handshake = false;
- }
- DeleteFrames(&transmission_info->retransmittable_frames);
-}
-
void QuicUnackedPacketMap::IncreaseLargestObserved(
QuicPacketNumber largest_observed) {
DCHECK_LE(largest_observed_, largest_observed);
« no previous file with comments | « net/quic/core/quic_unacked_packet_map.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698