Landing Recent QUIC changes until 5/14/2016 02:25:25 UTC

net/quic/quic_unacked_packet_map.h

 // 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.
 
 #ifndef NET_QUIC_QUIC_UNACKED_PACKET_MAP_H_
 #define NET_QUIC_QUIC_UNACKED_PACKET_MAP_H_
 
 #include <stddef.h>
 
 #include <deque>
@@ skipping 40 matching lines @@
                                QuicTime::Delta delta_largest_observed);
 
   // Notifies all the AckListeners attached to |newest_transmission|.
   void NotifyAndClearListeners(QuicPacketNumber newest_transmission,
                                QuicTime::Delta delta_largest_observed);
 
   // Marks |info| as no longer in flight.
   void RemoveFromInFlight(TransmissionInfo* info);
 
   // Marks |packet_number| as no longer in flight.
-  // TODO(ianswett): Remove this test-only method.
   void RemoveFromInFlight(QuicPacketNumber packet_number);
 
+  // Marks |packet_number| as in flight.  Must not be unackable.
+  void RestoreToInFlight(QuicPacketNumber packet_number);
+
   // No longer retransmit data for |stream_id|.
   void CancelRetransmissionsForStream(QuicStreamId stream_id);
 
   // Returns true if the unacked packet |packet_number| has retransmittable
   // frames.  This will return false if the packet has been acked, if a
   // previous transmission of this packet was ACK'd, or if this packet has been
   // retransmitted as with different packet number, or if the packet never
   // had any retransmittable packets in the first place.
   bool HasRetransmittableFrames(QuicPacketNumber packet_number) const;
 
@@ skipping 53 matching lines @@
 
   // Removes any retransmittable frames from this transmission or an associated
   // transmission.  It removes now useless transmissions, and disconnects any
   // other packets from other transmissions.
   void RemoveRetransmittability(TransmissionInfo* info);
 
   // Looks up the TransmissionInfo by |packet_number| and calls
   // RemoveRetransmittability.
   void RemoveRetransmittability(QuicPacketNumber packet_number);
 
-  // Removes any other retransmissions and marks all transmissions unackable.
-  void RemoveAckability(TransmissionInfo* info);
-
   // Increases the largest observed.  Any packets less or equal to
   // |largest_acked_packet| are discarded if they are only for the RTT purposes.
   void IncreaseLargestObserved(QuicPacketNumber largest_observed);
 
   // Remove any packets no longer needed for retransmission, congestion, or
   // RTT measurement purposes.
   void RemoveObsoletePackets();
 
  private:
   // Called when a packet is retransmitted with a new packet number.
@@ skipping 40 matching lines @@
   QuicByteCount bytes_in_flight_;
   // Number of retransmittable crypto handshake packets.
   size_t pending_crypto_packet_count_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicUnackedPacketMap);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_UNACKED_PACKET_MAP_H_