commit 6ed59d976c71c90fc9cc7f36cd9e6a59dc63a42b
author ianswett <ianswett@google.com> Tue Apr 06 06:40:03 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Apr 06 06:40:30 2021 -0700
tree ff6a42508cbdd27c00866d6a2fd9e4a14128a9af
parent c7556a0fe1226336dcda7bc153247fe5a1dd345f

Replace QuicConnection's WriteAndBundleAcksIfNotBlocked with WriteIfNotBlocked because they're functionally equivalent.

PiperOrigin-RevId: 366994317
Change-Id: I515b718b81ffc0248fcbfb733da7188bc8bfdc2e

quic/core/quic_connection.cc

diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index acab3f7..7f10238 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -117,7 +117,7 @@
 
   void OnAlarm() override {
     QUICHE_DCHECK(connection_->connected());
-    connection_->WriteAndBundleAcksIfNotBlocked();
+    connection_->WriteIfNotBlocked();
   }
 
  private:
@@ -2353,7 +2353,7 @@
   if (defer_send_in_response_to_packets_) {
     send_alarm_->Update(clock_->ApproximateNow(), QuicTime::Delta::Zero());
   } else {
-    WriteAndBundleAcksIfNotBlocked();
+    WriteIfNotBlocked();
   }
 }
 
@@ -2825,13 +2825,6 @@
   }
 }
 
-void QuicConnection::WriteAndBundleAcksIfNotBlocked() {
-  if (!HandleWriteBlocked()) {
-    ScopedPacketFlusher flusher(this);
-    WriteIfNotBlocked();
-  }
-}
-
 void QuicConnection::ReplaceInitialServerConnectionId(
     const QuicConnectionId& new_server_connection_id) {
   QUICHE_DCHECK(perspective_ == Perspective::IS_CLIENT);

quic/core/quic_connection.h

diff --git a/quic/core/quic_connection.h b/quic/core/quic_connection.h
index 0eb67dc..31ba053 100644
--- a/quic/core/quic_connection.h
+++ b/quic/core/quic_connection.h
@@ -601,10 +601,6 @@
   // If the socket is not blocked, writes queued packets.
   void WriteIfNotBlocked();
 
-  // If the socket is not blocked, writes queued packets and bundles any pending
-  // ACKs.
-  void WriteAndBundleAcksIfNotBlocked();
-
   // Set the packet writer.
   void SetQuicPacketWriter(QuicPacketWriter* writer, bool owns_writer) {
     QUICHE_DCHECK(writer != nullptr);