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

Unified Diff: net/quic/reliable_quic_stream.cc

Issue 851503003: Update from https://crrev.com/311076 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « net/quic/reliable_quic_stream.h ('k') | net/quic/reliable_quic_stream_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/reliable_quic_stream.cc
diff --git a/net/quic/reliable_quic_stream.cc b/net/quic/reliable_quic_stream.cc
index 6a2b8c7820749105db36a25d2c73967853766ae5..e6abe767c048c00a046f2ed748e1962f0d390556 100644
--- a/net/quic/reliable_quic_stream.cc
+++ b/net/quic/reliable_quic_stream.cc
@@ -27,26 +27,10 @@ struct iovec MakeIovec(StringPiece data) {
}
size_t GetInitialStreamFlowControlWindowToSend(QuicSession* session) {
- QuicVersion version = session->connection()->version();
- if (version <= QUIC_VERSION_19) {
- return session->config()->GetInitialFlowControlWindowToSend();
- }
-
return session->config()->GetInitialStreamFlowControlWindowToSend();
}
size_t GetReceivedFlowControlWindow(QuicSession* session) {
- QuicVersion version = session->connection()->version();
- if (version <= QUIC_VERSION_19) {
- if (session->config()->HasReceivedInitialFlowControlWindowBytes()) {
- return session->config()->ReceivedInitialFlowControlWindowBytes();
- }
-
- return kMinimumFlowControlSendWindow;
- }
-
- // Version must be >= QUIC_VERSION_21, so we check for stream specific flow
- // control window.
if (session->config()->HasReceivedInitialStreamFlowControlWindowBytes()) {
return session->config()->ReceivedInitialStreamFlowControlWindowBytes();
}
@@ -365,10 +349,7 @@ QuicConsumedData ReliableQuicStream::WritevData(
if (flow_controller_.IsEnabled()) {
// How much data we are allowed to write from flow control.
QuicByteCount send_window = flow_controller_.SendWindowSize();
- // TODO(rjshade): Remove connection_flow_controller_->IsEnabled() check when
- // removing QUIC_VERSION_19.
- if (stream_contributes_to_connection_flow_control_ &&
- connection_flow_controller_->IsEnabled()) {
+ if (stream_contributes_to_connection_flow_control_) {
send_window =
min(send_window, connection_flow_controller_->SendWindowSize());
}
« no previous file with comments | « net/quic/reliable_quic_stream.h ('k') | net/quic/reliable_quic_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698