gfe-relnote: In QUIC, inline WritevDataInner. Refactoring only, not protected. PiperOrigin-RevId: 255941214 Change-Id: I13fb4d91c27b69ab431b8e3b19560be5b9a4f95c
diff --git a/quic/core/quic_stream.cc b/quic/core/quic_stream.cc index 668dbdb..b0699d4 100644 --- a/quic/core/quic_stream.cc +++ b/quic/core/quic_stream.cc
@@ -657,16 +657,6 @@ (fin && fin_outstanding_); } -QuicConsumedData QuicStream::WritevDataInner(size_t write_length, - QuicStreamOffset offset, - bool fin) { - StreamSendingState state = fin ? FIN : NO_FIN; - if (fin && add_random_padding_after_fin_) { - state = FIN_AND_PADDING; - } - return session()->WritevData(this, id(), write_length, offset, state); -} - void QuicStream::CloseReadSide() { if (read_side_closed_) { return; @@ -974,8 +964,13 @@ if (session_->session_decides_what_to_write()) { session_->SetTransmissionType(NOT_RETRANSMISSION); } - QuicConsumedData consumed_data = - WritevDataInner(write_length, stream_bytes_written(), fin); + + StreamSendingState state = fin ? FIN : NO_FIN; + if (fin && add_random_padding_after_fin_) { + state = FIN_AND_PADDING; + } + QuicConsumedData consumed_data = session_->WritevData( + this, id(), write_length, stream_bytes_written(), state); OnStreamDataConsumed(consumed_data.bytes_consumed);
diff --git a/quic/core/quic_stream.h b/quic/core/quic_stream.h index f247e3f..6f5536d 100644 --- a/quic/core/quic_stream.h +++ b/quic/core/quic_stream.h
@@ -362,12 +362,6 @@ // TODO(fayang): Let WritevData return boolean. QuicConsumedData WritevData(const struct iovec* iov, int iov_count, bool fin); - // Allows override of the session level writev, for the force HOL - // blocking experiment. - virtual QuicConsumedData WritevDataInner(size_t write_length, - QuicStreamOffset offset, - bool fin); - // Close the read side of the socket. May cause the stream to be closed. // Subclasses and consumers should use StopReading to terminate reading early // if expecting a FIN. Can be used directly by subclasses if not expecting a