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

Unified Diff: net/quic/quic_protocol.cc

Issue 1495243002: Remove EncryptionLevel from QUIC's RetransmittableFrames and add it to TransmissionInfo. No functi… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@108735153
Patch Set: Created 5 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/quic_protocol.h ('k') | net/quic/quic_sent_packet_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_protocol.cc
diff --git a/net/quic/quic_protocol.cc b/net/quic/quic_protocol.cc
index 6705a762d302e1956360de9fb34b20effaec6fae..593a914a5a9f318d6ab83827703d3513ace72ee5 100644
--- a/net/quic/quic_protocol.cc
+++ b/net/quic/quic_protocol.cc
@@ -697,10 +697,8 @@ StringPiece QuicPacket::Plaintext() const {
length() - start_of_encrypted_data);
}
-RetransmittableFrames::RetransmittableFrames(EncryptionLevel level)
- : encryption_level_(level),
- has_crypto_handshake_(NOT_HANDSHAKE),
- needs_padding_(false) {
+RetransmittableFrames::RetransmittableFrames()
+ : has_crypto_handshake_(NOT_HANDSHAKE), needs_padding_(false) {
// TODO(ianswett): Consider using an inlined vector instead, since this
// is very frequently a single frame.
frames_.reserve(2);
@@ -844,6 +842,7 @@ ostream& operator<<(ostream& os, const QuicEncryptedPacket& s) {
TransmissionInfo::TransmissionInfo()
: retransmittable_frames(nullptr),
+ encryption_level(ENCRYPTION_NONE),
packet_number_length(PACKET_1BYTE_PACKET_NUMBER),
bytes_sent(0),
nack_count(0),
@@ -857,12 +856,14 @@ TransmissionInfo::TransmissionInfo()
TransmissionInfo::TransmissionInfo(
RetransmittableFrames* retransmittable_frames,
+ EncryptionLevel level,
QuicPacketNumberLength packet_number_length,
TransmissionType transmission_type,
QuicTime sent_time,
QuicPacketLength bytes_sent,
bool is_fec_packet)
: retransmittable_frames(retransmittable_frames),
+ encryption_level(level),
packet_number_length(packet_number_length),
bytes_sent(bytes_sent),
nack_count(0),
« no previous file with comments | « net/quic/quic_protocol.h ('k') | net/quic/quic_sent_packet_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698