Landing Recent QUIC changes until 01/28/2016 18:41 UTC

net/quic/quic_protocol.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_protocol.h"
 
 #include "base/stl_util.h"
 #include "net/quic/quic_flags.h"
 #include "net/quic/quic_utils.h"
 
@@ skipping 717 matching lines @@
   DCHECK(listener != nullptr);
 }
 
 AckListenerWrapper::~AckListenerWrapper() {}
 
 SerializedPacket::SerializedPacket(QuicPathId path_id,
                                    QuicPacketNumber packet_number,
                                    QuicPacketNumberLength packet_number_length,
                                    QuicEncryptedPacket* packet,
                                    QuicPacketEntropyHash entropy_hash,
-                                   QuicFrames* retransmittable_frames,
                                    bool has_ack,
                                    bool has_stop_waiting)
     : packet(packet),
-      retransmittable_frames(retransmittable_frames),
       has_crypto_handshake(NOT_HANDSHAKE),
       needs_padding(false),
       path_id(path_id),
       packet_number(packet_number),
       packet_number_length(packet_number_length),
       encryption_level(ENCRYPTION_NONE),
       entropy_hash(entropy_hash),
       is_fec_packet(false),
       has_ack(has_ack),
       has_stop_waiting(has_stop_waiting),
       original_packet_number(0),
       transmission_type(NOT_RETRANSMISSION) {}
 
-SerializedPacket::SerializedPacket(QuicPathId path_id,
-                                   QuicPacketNumber packet_number,
-                                   QuicPacketNumberLength packet_number_length,
-                                   char* encrypted_buffer,
-                                   size_t encrypted_length,
-                                   bool owns_buffer,
-                                   QuicPacketEntropyHash entropy_hash,
-                                   QuicFrames* retransmittable_frames,
-                                   bool padding,
-                                   IsHandshake is_handshake,
-                                   bool has_ack,
-                                   bool has_stop_waiting,
-                                   EncryptionLevel level)
-    : SerializedPacket(path_id,
-                       packet_number,
-                       packet_number_length,
-                       new QuicEncryptedPacket(encrypted_buffer,
-                                               encrypted_length,
-                                               owns_buffer),
-                       entropy_hash,
-                       retransmittable_frames,
-                       has_ack,
-                       has_stop_waiting) {
-  // TODO(ianswett): Move into the initializer list once SerializedPacket
-  // no longer contains an encrypted packet.
-  encryption_level = level;
-  needs_padding = padding;
-  has_crypto_handshake = is_handshake;
-}
-
 SerializedPacket::~SerializedPacket() {}
 
 QuicEncryptedPacket* QuicEncryptedPacket::Clone() const {
   char* buffer = new char[this->length()];
   memcpy(buffer, this->data(), this->length());
   return new QuicEncryptedPacket(buffer, this->length(), true);
 }
 
 ostream& operator<<(ostream& os, const QuicEncryptedPacket& s) {
   os << s.length() << "-byte data";
@@ skipping 31 matching lines @@
       in_flight(false),
       is_unackable(false),
       is_fec_packet(is_fec_packet),
       has_crypto_handshake(has_crypto_handshake),
       needs_padding(needs_padding),
       retransmission(0) {}
 
 TransmissionInfo::~TransmissionInfo() {}
 
 }  // namespace net