Landing Recent QUIC changes until 5/14/2016 02:25:25 UTC

net/quic/congestion_control/tcp_cubic_sender_packets.cc

 // 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.
 
 #include "net/quic/congestion_control/tcp_cubic_sender_packets.h"
 
 #include <algorithm>
 
 #include "base/metrics/histogram_macros.h"
 #include "net/quic/congestion_control/prr_sender.h"
@@ skipping 35 matching lines @@
 
 TcpCubicSenderPackets::~TcpCubicSenderPackets() {}
 
 void TcpCubicSenderPackets::SetCongestionWindowFromBandwidthAndRtt(
     QuicBandwidth bandwidth,
     QuicTime::Delta rtt) {
   QuicPacketCount new_congestion_window =
       bandwidth.ToBytesPerPeriod(rtt) / kDefaultTCPMSS;
   if (FLAGS_quic_no_lower_bw_resumption_limit) {
     // Limit new CWND to be in the range [1, kMaxCongestionWindow].
-    congestion_window_ = max(min_congestion_window_,
-                             min(new_congestion_window, kMaxCongestionWindow));
+    congestion_window_ =
+        max(min_congestion_window_,
+            min(new_congestion_window, kMaxResumptionCongestionWindow));
   } else {
-    congestion_window_ = max(min(new_congestion_window, kMaxCongestionWindow),
-                             kMinCongestionWindowForBandwidthResumption);
+    congestion_window_ =
+        max(min(new_congestion_window, kMaxResumptionCongestionWindow),
+            kMinCongestionWindowForBandwidthResumption);
   }
 }
 
 void TcpCubicSenderPackets::SetCongestionWindowInPackets(
     QuicPacketCount congestion_window) {
   congestion_window_ = congestion_window;
 }
 
 void TcpCubicSenderPackets::SetMinCongestionWindowInPackets(
     QuicPacketCount congestion_window) {
@@ skipping 140 matching lines @@
   congestion_window_ = initial_tcp_congestion_window_;
   slowstart_threshold_ = initial_max_tcp_congestion_window_;
   max_tcp_congestion_window_ = initial_max_tcp_congestion_window_;
 }
 
 CongestionControlType TcpCubicSenderPackets::GetCongestionControlType() const {
   return reno_ ? kReno : kCubic;
 }
 
 }  // namespace net