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

net/quic/quic_unacked_packet_map.cc

 // Copyright 2014 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_unacked_packet_map.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "net/quic/quic_bug_tracker.h"
 #include "net/quic/quic_connection_stats.h"
@@ skipping 44 matching lines @@
     TransferRetransmissionInfo(old_packet_number, packet_number,
                                transmission_type, &info);
   }
 
   largest_sent_packet_ = packet_number;
   if (set_in_flight) {
     bytes_in_flight_ += bytes_sent;
     info.in_flight = true;
   }
   unacked_packets_.push_back(info);
-  // Swap the ack listeners after to avoid an extra list allocation.
+  // Swap the ack listeners and retransmittable frames to avoid allocations.
   // TODO(ianswett): Could use emplace_back when Chromium can.
   if (old_packet_number == 0) {
     if (has_crypto_handshake) {
       ++pending_crypto_packet_count_;
     }
-    if (packet->retransmittable_frames != nullptr) {
-      packet->retransmittable_frames->swap(
-          unacked_packets_.back().retransmittable_frames);
-      delete packet->retransmittable_frames;
-      packet->retransmittable_frames = nullptr;
-    }
+
+    packet->retransmittable_frames.swap(
+        unacked_packets_.back().retransmittable_frames);
     unacked_packets_.back().ack_listeners.swap(packet->listeners);
   }
 }
 
 void QuicUnackedPacketMap::RemoveObsoletePackets() {
   while (!unacked_packets_.empty()) {
     if (!IsPacketUseless(least_unacked_, unacked_packets_.front())) {
       break;
     }
 
@@ skipping 265 matching lines @@
     }
   }
   return false;
 }
 
 QuicPacketNumber QuicUnackedPacketMap::GetLeastUnacked() const {
   return least_unacked_;
 }
 
 }  // namespace net