Queueing QUIC frames to be resent instead of packets and packing RST frames with acks and congestion info frames.

Merge internal change: 40834055


Review URL: https://chromiumcodereview.appspot.com/11958018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177348 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 13 deletions

diff --git a/net/quic/quic_framer.cc b/net/quic/quic_framer.cc
index f5ec5e1..cae0b85 100644
--- a/net/quic/quic_framer.cc
+++ b/net/quic/quic_framer.cc
@@ -51,6 +51,7 @@ QuicPacket* QuicFramer::ConstructMaxFrameDataPacket(
     const QuicPacketHeader& header,
     const QuicFrames& frames,
     size_t* num_consumed) {
+  DCHECK(!frames.empty());
   // Compute the length of the packet.  We use "magic numbers" here because
   // sizeof(member_) is not necessarily the same as sizeof(member_wire_format).
   const size_t max_plaintext_size = GetMaxPlaintextSize(kMaxPacketSize);
@@ -89,7 +90,7 @@ QuicPacket* QuicFramer::ConstructMaxFrameDataPacket(
   }
 
   // frame count
-  if (frames.size() > 256u) {
+  if (*num_consumed > 256u) {
     return NULL;
   }
   if (!writer.WriteUInt8(*num_consumed)) {
@@ -608,18 +609,6 @@ bool QuicFramer::ProcessConnectionCloseFrame() {
   return true;
 }
 
-void QuicFramer::WriteSequenceNumber(QuicPacketSequenceNumber sequence_number,
-                                     QuicPacket* packet) {
-  QuicDataWriter::WriteUint48ToBuffer(
-      sequence_number, packet->mutable_data() + kSequenceNumberOffset);
-}
-
-void QuicFramer::WriteFecGroup(QuicFecGroupNumber fec_group,
-                               QuicPacket* packet) {
-  QuicDataWriter::WriteUint8ToBuffer(
-      fec_group, packet->mutable_data() + kFecGroupOffset);
-}
-
 QuicEncryptedPacket* QuicFramer::EncryptPacket(const QuicPacket& packet) {
   scoped_ptr<QuicData> out(encrypter_->Encrypt(packet.AssociatedData(),
                                                packet.Plaintext()));