Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Unified Diff: net/quic/congestion_control/cubic.cc

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/quic/congestion_control/cubic.cc
diff --git a/net/quic/congestion_control/cubic.cc b/net/quic/congestion_control/cubic.cc
index 7b9905759829e743b918c13178dc9a2f04660133..dc6b89bf9d01fb5e7e0307000a7bb80509a45761 100644
--- a/net/quic/congestion_control/cubic.cc
+++ b/net/quic/congestion_control/cubic.cc
@@ -10,7 +10,6 @@
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/time/time.h"
-#include "net/quic/congestion_control/cube_root.h"
#include "net/quic/quic_flags.h"
#include "net/quic/quic_protocol.h"
@@ -136,17 +135,9 @@ QuicPacketCount Cubic::CongestionWindowAfterAck(
time_to_origin_point_ = 0;
origin_point_congestion_window_ = current_congestion_window;
} else {
- if (FLAGS_quic_use_std_cbrt) {
- time_to_origin_point_ = static_cast<uint32>(
- cbrt(kCubeFactor *
- (last_max_congestion_window_ - current_congestion_window)));
- } else {
- // TODO(rjshade): Remove CubeRoot source when removing
- // FLAGS_quic_use_std_cbrt.
- time_to_origin_point_ =
- CubeRoot::Root(kCubeFactor * (last_max_congestion_window_ -
- current_congestion_window));
- }
+ time_to_origin_point_ =
+ static_cast<uint32>(cbrt(kCubeFactor * (last_max_congestion_window_ -
+ current_congestion_window)));
origin_point_congestion_window_ =
last_max_congestion_window_;
}
« no previous file with comments | « net/quic/congestion_control/cube_root_test.cc ('k') | net/quic/congestion_control/receive_algorithm_interface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698