Land Recent QUIC Changes.

net/quic/quic_received_packet_manager.h

 // Copyright 2013 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.
 //
 // Manages the packet entropy calculation for both sent and received packets
 // for a connection.
 
 #ifndef NET_QUIC_QUIC_RECEIVED_PACKET_MANAGER_H_
 #define NET_QUIC_QUIC_RECEIVED_PACKET_MANAGER_H_
 
@@ skipping 96 matching lines @@
                             QuicTime receipt_time);
 
   void RecordPacketRevived(QuicPacketSequenceNumber sequence_number);
 
   // Checks whether |sequence_number| is missing and less than largest observed.
   bool IsMissing(QuicPacketSequenceNumber sequence_number);
 
   // Checks if we're still waiting for the packet with |sequence_number|.
   bool IsAwaitingPacket(QuicPacketSequenceNumber sequence_number);
 
   // Update the |received_info| for an outgoing ack.

[wtc, 2014/08/04 23:28:13]

|received_info| => |ack_frame|. Also fix line 134.

[ramant (doing other things), 2014/08/09 02:53:19]

Done.

-  void UpdateReceivedPacketInfo(ReceivedPacketInfo* received_info,
+  void UpdateReceivedPacketInfo(QuicAckFrame* ack_frame,
                                 QuicTime approximate_now);
 
   // Should be called before sending an ACK packet, to decide if we need
   // to attach a QuicCongestionFeedbackFrame block.
   // Returns false if no QuicCongestionFeedbackFrame block is needed.
   // Otherwise fills in feedback and returns true.
   virtual bool GenerateCongestionFeedback(
       QuicCongestionFeedbackFrame* feedback);
 
   // QuicReceivedEntropyHashCalculatorInterface
   // Called by QuicFramer, when the outgoing ack gets truncated, to recalculate
   // the received entropy hash for the truncated ack frame.
   virtual QuicPacketEntropyHash EntropyHash(
       QuicPacketSequenceNumber sequence_number) const OVERRIDE;
 
   // Updates internal state based on |received_info|.
-  void UpdatePacketInformationReceivedByPeer(
-      const ReceivedPacketInfo& received_nfo);
+  void UpdatePacketInformationReceivedByPeer(const QuicAckFrame& ack_frame);
   // Updates internal state based on |stop_waiting|.
   void UpdatePacketInformationSentByPeer(
       const QuicStopWaitingFrame& stop_waiting);
 
   // Returns whether the peer is missing packets.
   bool HasMissingPackets();
 
   // Returns true when there are new missing packets to be reported within 3
   // packets of the largest observed.
   bool HasNewMissingPackets();
@@ skipping 27 matching lines @@
   // Largest sequence number that the peer has observed. Mostly received,
   // missing in case of truncated acks.
   QuicPacketSequenceNumber peer_largest_observed_packet_;
   // Least sequence number which the peer is still waiting for.
   QuicPacketSequenceNumber least_packet_awaited_by_peer_;
   // Least sequence number of the the packet sent by the peer for which it
   // hasn't received an ack.
   QuicPacketSequenceNumber peer_least_packet_awaiting_ack_;
 
   // Received packet information used to produce acks.
-  ReceivedPacketInfo received_info_;
+  QuicAckFrame ack_frame_;
 
   // The time we received the largest_observed sequence number, or zero if
   // no sequence numbers have been received since UpdateReceivedPacketInfo.
   // Needed for calculating delta_time_largest_observed.
   QuicTime time_largest_observed_;
 
   scoped_ptr<ReceiveAlgorithmInterface> receive_algorithm_;
 
   QuicConnectionStats* stats_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicReceivedPacketManager);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_RECEIVED_PACKET_MANAGER_H_