commit d5c4a93c45184e0d4758b42029bf16811d7a618a
author nharper <nharper@google.com> Mon May 13 13:58:49 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue May 14 06:33:13 2019 -0700
tree 062d796a3425fe3f147d9d19ccfaddc1bc95c8bd
parent 51961cfa1aa9797ab52c6a5b975e592139c9f8ae

Don't use a flow controller for QuicCryptoStream when it uses CRYPTO frames

gfe-relnote: QuicCryptoStream change protected behind QUIC_VERSION_99
PiperOrigin-RevId: 248004335
Change-Id: I97d5b6ed0e5523a4264ce2f06e5f6c3249a99fe9

quic/core/quic_session.cc

diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index 2505f7e..8bdf3b5 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -86,7 +86,8 @@
       closed_streams_clean_up_alarm_(nullptr),
       supported_versions_(supported_versions),
       eliminate_static_stream_map_(
-          GetQuicReloadableFlag(quic_eliminate_static_stream_map_2)) {
+          GetQuicReloadableFlag(quic_eliminate_static_stream_map_2) ||
+          QuicVersionUsesCryptoFrames(connection->transport_version())) {
   closed_streams_clean_up_alarm_ =
       QuicWrapUnique<QuicAlarm>(connection_->alarm_factory()->CreateAlarm(
           new ClosedStreamsCleanUpDelegate(this)));
@@ -1024,7 +1025,8 @@
   for (auto const& kv : dynamic_stream_map_) {
     kv.second->flow_controller()->UpdateReceiveWindowSize(stream_window);
   }
-  if (eliminate_static_stream_map_) {
+  if (eliminate_static_stream_map_ &&
+      !QuicVersionUsesCryptoFrames(connection_->transport_version())) {
     QUIC_RELOADABLE_FLAG_COUNT_N(quic_eliminate_static_stream_map_2, 11, 17);
     GetMutableCryptoStream()->flow_controller()->UpdateReceiveWindowSize(
         stream_window);
@@ -1074,7 +1076,8 @@
   for (auto const& kv : dynamic_stream_map_) {
     kv.second->UpdateSendWindowOffset(new_window);
   }
-  if (eliminate_static_stream_map_) {
+  if (eliminate_static_stream_map_ &&
+      !QuicVersionUsesCryptoFrames(connection_->transport_version())) {
     QUIC_RELOADABLE_FLAG_COUNT_N(quic_eliminate_static_stream_map_2, 12, 17);
     GetMutableCryptoStream()->UpdateSendWindowOffset(new_window);
   }
@@ -1454,6 +1457,7 @@
     }
   }
   if (eliminate_static_stream_map_ &&
+      !QuicVersionUsesCryptoFrames(connection_->transport_version()) &&
       GetMutableCryptoStream()->flow_controller()->IsBlocked()) {
     QUIC_RELOADABLE_FLAG_COUNT_N(quic_eliminate_static_stream_map_2, 14, 17);
     return true;