Land Recent QUIC changes.

net/quic/quic_packet_generator.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.
 //
 // Responsible for generating packets on behalf of a QuicConnection.
 // Packets are serialized just-in-time.  Control frames are queued.
 // Ack and Feedback frames will be requested from the Connection
 // just-in-time.  When a packet needs to be sent, the Generator
 // will serialize a packet and pass it to QuicConnection::SendOrQueuePacket()
 //
 // The Generator's mode of operation is controlled by two conditions:
 //
 // 1) Is the Delegate writable?
 //
 // If the Delegate is not writable, then no operations will cause
 // a packet to be serialized.  In particular:
 // * SetShouldSendAck will simply record that an ack is to be sent.
-// * AddControlFram will enqueue the control frame.
+// * AddControlFrame will enqueue the control frame.
 // * ConsumeData will do nothing.
 //
 // If the Delegate is writable, then the behavior depends on the second
 // condition:
 //
 // 2) Is the Generator in batch mode?
 //
 // If the Generator is NOT in batch mode, then each call to a write
 // operation will serialize one or more packets.  The contents will
 // include any previous queued frames.  If an ack should be sent
@@ skipping 55 matching lines @@
     // Called when a frame has been added to the current packet.
     virtual void OnFrameAddedToPacket(const QuicFrame& frame) = 0;
   };
 
   QuicPacketGenerator(DelegateInterface* delegate,
                       DebugDelegateInterface* debug_delegate,
                       QuicPacketCreator* creator);
 
   virtual ~QuicPacketGenerator();
 
+  // Indicates that an ACK frame should be sent.  If |also_send_feedback| is
+  // true, then it also indicates a CONGESTION_FEEDBACK frame should be sent.
+  // The contents of the frame(s) will be generated via a call to the delegates
+  // CreateAckFrame() and CreateFeedbackFrame() when the packet is serialized.
   void SetShouldSendAck(bool also_send_feedback);
   void AddControlFrame(const QuicFrame& frame);
 
-  // Given some data, may consume part or all of it and pass it to the packet
-  // creator to be serialized into packets. If not in batch mode, these packets
-  // will also be sent during this call.
+  // Given some data, may consume part or all of it and pass it to the
+  // packet creator to be serialized into packets. If not in batch
+  // mode, these packets will also be sent during this call. Also
+  // attaches a QuicAckNotifier to any created stream frames, which
+  // will be called once the frame is ACKed by the peer. The
+  // QuicAckNotifier is owned by the QuicConnection. |notifier| may
+  // be NULL.
   QuicConsumedData ConsumeData(QuicStreamId id,
                                base::StringPiece data,
                                QuicStreamOffset offset,
-                               bool fin);
-
-  // As above, but attaches a QuicAckNotifier to any created stream frames,
-  // which will be called once the frame is ACKed by the peer.
-  // The QuicAckNotifier is owned by the QuicConnection.
-  QuicConsumedData ConsumeData(QuicStreamId id,
-                               base::StringPiece data,
-                               QuicStreamOffset offset,
                                bool fin,
                                QuicAckNotifier* notifier);
 
   // Indicates whether batch mode is currently enabled.
   bool InBatchMode();
   // Disables flushing.
   void StartBatchOperations();
   // Enables flushing and flushes queued data.
   void FinishBatchOperations();
 
@@ skipping 37 matching lines @@
   // can later be (optionally) retransmitted.
   scoped_ptr<QuicAckFrame> pending_ack_frame_;
   scoped_ptr<QuicCongestionFeedbackFrame> pending_feedback_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicPacketGenerator);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_PACKET_GENERATOR_H_