Landing Recent QUIC changes until Sat Sep 10 00:32:41

net/quic/core/quic_stream_sequencer_buffer.cc

 // Copyright (c) 2015 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.
 
 #include "net/quic/core/quic_stream_sequencer_buffer.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/core/quic_bug_tracker.h"
 #include "net/quic/core/quic_flags.h"
@@ skipping 127 matching lines @@
         "\nCurrent gaps: " + GapsDebugString();
     return QUIC_OVERLAPPING_STREAM_DATA;
   }
 
   // Write beyond the current range this buffer is covering.
   if (offset + size > total_bytes_read_ + max_buffer_capacity_bytes_) {
     *error_details = "Received data beyond available range.";
     return QUIC_INTERNAL_ERROR;
   }
 
-  if (FLAGS_quic_limit_frame_gaps_in_buffer &&
-      current_gap->begin_offset != starting_offset &&
+  if (current_gap->begin_offset != starting_offset &&
       current_gap->end_offset != starting_offset + data.length() &&
       gaps_.size() >= kMaxNumGapsAllowed) {
     // This frame is going to create one more gap which exceeds max number of
     // gaps allowed. Stop processing.
     *error_details = "Too many gaps created for this stream.";
     return QUIC_TOO_MANY_FRAME_GAPS;
   }
 
   size_t total_written = 0;
   size_t source_remaining = size;
@@ skipping 304 matching lines @@
   if (GetBlockIndex(gaps_.back().begin_offset - 1) == block_index) {
     return;
   }
 
   // Read index remains in this block, which means a gap has been reached.
   if (NextBlockToRead() == block_index) {
     Gap first_gap = gaps_.front();
     DCHECK(first_gap.begin_offset == total_bytes_read_);
     // Check where the next piece data is.
     // Not empty if next piece of data is still in this chunk.
-    bool gap_extends_to_infinity =
-        (first_gap.end_offset == std::numeric_limits<QuicStreamOffset>::max());
     bool gap_ends_in_this_block =
         (GetBlockIndex(first_gap.end_offset) == block_index);
-    if ((!FLAGS_quic_sequencer_buffer_retire_block_in_time &&
-         !gap_extends_to_infinity) ||
-        gap_ends_in_this_block) {
+    if (gap_ends_in_this_block) {
       return;
     }
   }
   RetireBlock(block_index);
 }
 
 bool QuicStreamSequencerBuffer::Empty() const {
   return gaps_.size() == 1 && gaps_.front().begin_offset == total_bytes_read_;
 }
 
@@ skipping 48 matching lines @@
     QuicStreamOffset current_frame_begin_offset = it.first;
     QuicStreamOffset current_frame_end_offset =
         it.second.length + current_frame_begin_offset;
     current_frames_string +=
         RangeDebugString(current_frame_begin_offset, current_frame_end_offset);
   }
   return current_frames_string;
 }
 
 }  //  namespace net