Land Recent QUIC Changes until 05/13/2015

net/quic/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/quic_flow_controller.h"
 
 #include "base/basictypes.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_flags.h"
 #include "net/quic/quic_protocol.h"
@@ skipping 74 matching lines @@
     return true;
   }
   return false;
 }
 
 void QuicFlowController::MaybeSendWindowUpdate() {
   // Send WindowUpdate to increase receive window if
   // (receive window offset - consumed bytes) < (max window / 2).
   // This is behaviour copied from SPDY.
   DCHECK_LT(bytes_consumed_, receive_window_offset_);
-  QuicStreamOffset consumed_window = receive_window_offset_ - bytes_consumed_;
+  QuicStreamOffset available_window = receive_window_offset_ - bytes_consumed_;
   QuicByteCount threshold = (max_receive_window_ / 2);
 
-  if (consumed_window < threshold) {
+  if (available_window < threshold) {
     // Update our receive window.
-    receive_window_offset_ += (max_receive_window_ - consumed_window);
+    receive_window_offset_ += (max_receive_window_ - available_window);
 
     DVLOG(1) << ENDPOINT << "Sending WindowUpdate frame for stream " << id_
              << ", consumed bytes: " << bytes_consumed_
-             << ", consumed window: " << consumed_window
+             << ", available window: " << available_window
              << ", and threshold: " << threshold
              << ", and max recvw: " << max_receive_window_
              << ". New receive window offset is: " << receive_window_offset_;
 
     // Inform the peer of our new receive window.
     connection_->SendWindowUpdate(id_, receive_window_offset_);
   }
 }
 
 void QuicFlowController::MaybeSendBlocked() {
@@ skipping 35 matching lines @@
 }
 
 uint64 QuicFlowController::SendWindowSize() const {
   if (bytes_sent_ > send_window_offset_) {
     return 0;
   }
   return send_window_offset_ - bytes_sent_;
 }
 
 }  // namespace net