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

net/quic/quic_protocol.h

 // 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.
 
 #ifndef NET_QUIC_QUIC_PROTOCOL_H_
 #define NET_QUIC_QUIC_PROTOCOL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 1277 matching lines @@
   scoped_refptr<QuicAckListenerInterface> ack_listener;
   QuicPacketLength length;
 };
 
 struct NET_EXPORT_PRIVATE 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);
-  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 needs_padding,
-                   IsHandshake is_handshake,
-                   bool has_ack,
-                   bool has_stop_waiting,
-                   EncryptionLevel level);
   ~SerializedPacket();
 
   QuicEncryptedPacket* packet;
-  QuicFrames* retransmittable_frames;
+  QuicFrames retransmittable_frames;
   IsHandshake has_crypto_handshake;
   bool needs_padding;
   QuicPathId path_id;
   QuicPacketNumber packet_number;
   QuicPacketNumberLength packet_number_length;
   EncryptionLevel encryption_level;
   QuicPacketEntropyHash entropy_hash;
   bool is_fec_packet;
   bool has_ack;
   bool has_stop_waiting;
@@ skipping 84 matching lines @@
       : iov(iov), iov_count(iov_count), total_length(total_length) {}
 
   const struct iovec* iov;
   const int iov_count;
   const size_t total_length;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_PROTOCOL_H_