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 serialized a packet and pass it to QuicConnection::SendOrQueuePacket()
 //
@@ skipping 44 matching lines @@
 
 #include "net/quic/quic_packet_creator.h"
 
 namespace net {
 
 class NET_EXPORT_PRIVATE QuicPacketGenerator {
  public:
   class NET_EXPORT_PRIVATE DelegateInterface {
    public:
     virtual ~DelegateInterface() {}
-    virtual bool CanWrite(bool is_retransmission) = 0;
+    virtual bool CanWrite(bool is_retransmission,
+                          bool has_retransmittable_data) = 0;
     virtual QuicAckFrame* CreateAckFrame() = 0;
     virtual QuicCongestionFeedbackFrame* CreateFeedbackFrame() = 0;
     // Takes ownership of |packet.packet| and |packet.retransmittable_frames|.
     virtual bool OnSerializedPacket(const SerializedPacket& packet) = 0;
   };
 
   QuicPacketGenerator(DelegateInterface* delegate,
                       QuicPacketCreator* creator);
 
   virtual ~QuicPacketGenerator();
@@ skipping 28 matching lines @@
   scoped_ptr<QuicAckFrame> pending_ack_frame_;
   scoped_ptr<QuicCongestionFeedbackFrame> pending_feedback_frame_;
   bool should_send_feedback_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicPacketGenerator);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_PACKET_GENERATOR_H_