Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/core/quic_flow_controller.cc

 // Copyright 2014 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_flow_controller.h"
 
 #include <cstdint>
 
 #include "net/quic/core/quic_connection.h"
-#include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_packets.h"
 #include "net/quic/platform/api/quic_bug_tracker.h"
 #include "net/quic/platform/api/quic_flag_utils.h"
+#include "net/quic/platform/api/quic_flags.h"
 #include "net/quic/platform/api/quic_logging.h"
 #include "net/quic/platform/api/quic_str_cat.h"
 
 namespace net {
 
 #define ENDPOINT \
   (perspective_ == Perspective::IS_SERVER ? "Server: " : "Client: ")
 
 QuicFlowController::QuicFlowController(
     QuicConnection* connection,
@@ skipping 219 matching lines @@
   // Only update if send window has increased.
   if (new_send_window_offset <= send_window_offset_) {
     return false;
   }
 
   QUIC_DVLOG(1) << ENDPOINT << "UpdateSendWindowOffset for stream " << id_
                 << " with new offset " << new_send_window_offset
                 << " current offset: " << send_window_offset_
                 << " bytes_sent: " << bytes_sent_;
 
-  const bool blocked = IsBlocked();
+  // The flow is now unblocked but could have also been unblocked
+  // before.  Return true iff this update caused a change from blocked
+  // to unblocked.
+  const bool was_previously_blocked = IsBlocked();
   send_window_offset_ = new_send_window_offset;
-  return blocked;
+  return was_previously_blocked;
 }
 
 void QuicFlowController::EnsureWindowAtLeast(QuicByteCount window_size) {
   if (receive_window_size_limit_ >= window_size) {
     return;
   }
 
   QuicStreamOffset available_window = receive_window_offset_ - bytes_consumed_;
   IncreaseWindowSize();
   SendWindowUpdate(available_window);
@@ skipping 17 matching lines @@
   if (receive_window_size_ != receive_window_offset_) {
     QUIC_BUG << "receive_window_size_:" << receive_window_size_
              << " != receive_window_offset:" << receive_window_offset_;
     return;
   }
   receive_window_size_ = size;
   receive_window_offset_ = size;
 }
 
 }  // namespace net