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()
 //
@@ skipping 39 matching lines @@
 // even if the Delegate has become unwritable after handling the
 // data packet immediately proceeding the FEC packet.
 
 #ifndef NET_QUIC_QUIC_PACKET_GENERATOR_H_
 #define NET_QUIC_QUIC_PACKET_GENERATOR_H_
 
 #include "net/quic/quic_packet_creator.h"
 
 namespace net {
 
+class QuicAckNotifier;
+
 class NET_EXPORT_PRIVATE QuicPacketGenerator {
  public:
   class NET_EXPORT_PRIVATE DelegateInterface {
    public:
     virtual ~DelegateInterface() {}
     virtual bool CanWrite(Retransmission retransmission,
                           HasRetransmittableData retransmittable,
                           IsHandshake handshake) = 0;
     virtual QuicAckFrame* CreateAckFrame() = 0;
     virtual QuicCongestionFeedbackFrame* CreateFeedbackFrame() = 0;
@@ skipping 13 matching lines @@
   };
 
   QuicPacketGenerator(DelegateInterface* delegate,
                       DebugDelegateInterface* debug_delegate,
                       QuicPacketCreator* creator);
 
   virtual ~QuicPacketGenerator();
 
   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.
   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();
 
   bool HasQueuedFrames() const;
 
   void set_debug_delegate(DebugDelegateInterface* debug_delegate) {
     debug_delegate_ = debug_delegate;
   }
 
  private:
   void SendQueuedFrames();
 
   // Test to see if we have pending ack, feedback, or control frames.
   bool HasPendingFrames() const;
   // Test to see if the addition of a pending frame (which might be
   // retransmittable) would still allow the resulting packet to be sent now.
   bool CanSendWithNextPendingFrameAddition() const;
   // Add exactly one pending frame, preferring ack over feedback over control
   // frames.
   bool AddNextPendingFrame();
 
   bool AddFrame(const QuicFrame& frame);
+
   void SerializeAndSendPacket();
 
   DelegateInterface* delegate_;
   DebugDelegateInterface* debug_delegate_;
 
   QuicPacketCreator* packet_creator_;
   QuicFrames queued_control_frames_;
 
   // True if batch mode is currently enabled.
   bool batch_mode_;
 
   // Flags to indicate the need for just-in-time construction of a frame.
   bool should_send_ack_;
   bool should_send_feedback_;
   // If we put a non-retransmittable frame (namley ack or feedback frame) in
   // this packet, then we have to hold a reference to it until we flush (and
   // serialize it). Retransmittable frames are referenced elsewhere so that they
   // 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_