Landing Recent QUIC changes until Sun Sep 4 03:41:00

net/quic/core/quic_packet_creator.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.
 //
 // Accumulates frames for the next packet until more frames no longer fit or
 // it's time to create a packet from them. If multipath enabled, only creates
 // packets on one path at the same time. Currently, next packet number is
 // tracked per-path.
 
 #ifndef NET_QUIC_QUIC_PACKET_CREATOR_H_
@@ skipping 97 matching lines @@
   // Re-serializes frames with the original packet's packet number length.
   // Used for retransmitting packets to ensure they aren't too long.
   void ReserializeAllFrames(const PendingRetransmission& retransmission,
                             char* buffer,
                             size_t buffer_len);
 
   // Serializes all added frames into a single packet and invokes the delegate_
   // to further process the SerializedPacket.
   void Flush();
 
-  // Optimized method to create a QuicStreamFrame, serialize it, and encrypt it
-  // into |encrypted_buffer|. Adds the QuicStreamFrame to the returned
-  // SerializedPacket.  Sets |num_bytes_consumed| to the number of bytes
-  // consumed to create the QuicStreamFrame.
+  // Optimized method to create a QuicStreamFrame and serialize it. Adds the
+  // QuicStreamFrame to the returned SerializedPacket.  Sets
+  // |num_bytes_consumed| to the number of bytes consumed to create the
+  // QuicStreamFrame.
   void CreateAndSerializeStreamFrame(QuicStreamId id,
                                      const QuicIOVector& iov,
                                      QuicStreamOffset iov_offset,
                                      QuicStreamOffset stream_offset,
                                      bool fin,
                                      QuicAckListenerInterface* listener,
-                                     char* encrypted_buffer,
-                                     size_t encrypted_buffer_len,
                                      size_t* num_bytes_consumed);
 
   // Returns true if there are frames pending to be serialized.
   bool HasPendingFrames() const;
 
   // Returns true if there are retransmittable frames pending to be serialized.
   bool HasPendingRetransmittableFrames() const;
 
   // Returns the number of bytes which are available to be used by additional
   // frames in the packet.  Since stream frames are slightly smaller when they
@@ skipping 205 matching lines @@
 
   // Map mapping path_id to last sent packet number on the path.
   std::unordered_map<QuicPathId, QuicPacketNumber> multipath_packet_number_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicPacketCreator);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_PACKET_CREATOR_H_