Change QuicSpdySession::GetSpdyDataStream() to GetOrCreateSpdyDataStream() because new stream might be created from this method.
gfe-relnote: n/a. Function name change only.
PiperOrigin-RevId: 284864828
Change-Id: I4de05ab179e6b29a57de302b2bf63ba460758da6
diff --git a/quic/core/http/quic_spdy_client_session_base.cc b/quic/core/http/quic_spdy_client_session_base.cc
index b19ea1a..6adcf70 100644
--- a/quic/core/http/quic_spdy_client_session_base.cc
+++ b/quic/core/http/quic_spdy_client_session_base.cc
@@ -94,7 +94,7 @@
}
largest_promised_stream_id_ = promised_stream_id;
- QuicSpdyStream* stream = GetSpdyDataStream(stream_id);
+ QuicSpdyStream* stream = GetOrCreateSpdyDataStream(stream_id);
if (!stream) {
// It's quite possible to receive headers after a stream has been reset.
return;
diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc
index 661e6ef..2d38f86 100644
--- a/quic/core/http/quic_spdy_session.cc
+++ b/quic/core/http/quic_spdy_session.cc
@@ -433,7 +433,7 @@
void QuicSpdySession::OnStreamHeadersPriority(
QuicStreamId stream_id,
const spdy::SpdyStreamPrecedence& precedence) {
- QuicSpdyStream* stream = GetSpdyDataStream(stream_id);
+ QuicSpdyStream* stream = GetOrCreateSpdyDataStream(stream_id);
if (!stream) {
// It's quite possible to receive headers after a stream has been reset.
return;
@@ -451,7 +451,7 @@
ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
return;
}
- QuicSpdyStream* stream = GetSpdyDataStream(stream_id);
+ QuicSpdyStream* stream = GetOrCreateSpdyDataStream(stream_id);
if (stream == nullptr) {
// The stream no longer exists, but trailing headers may contain the final
// byte offset necessary for flow control and open stream accounting.
@@ -483,7 +483,7 @@
void QuicSpdySession::OnPriorityFrame(
QuicStreamId stream_id,
const spdy::SpdyStreamPrecedence& precedence) {
- QuicSpdyStream* stream = GetSpdyDataStream(stream_id);
+ QuicSpdyStream* stream = GetOrCreateSpdyDataStream(stream_id);
if (!stream) {
// It's quite possible to receive a PRIORITY frame after a stream has been
// reset.
@@ -591,7 +591,7 @@
PushPromiseFrame frame;
frame.push_id = promised_stream_id;
frame.headers = encoded_headers;
- QuicSpdyStream* stream = GetSpdyDataStream(original_stream_id);
+ QuicSpdyStream* stream = GetOrCreateSpdyDataStream(original_stream_id);
stream->WritePushPromise(frame);
}
@@ -622,11 +622,11 @@
return qpack_decoder_.get();
}
-QuicSpdyStream* QuicSpdySession::GetSpdyDataStream(
+QuicSpdyStream* QuicSpdySession::GetOrCreateSpdyDataStream(
const QuicStreamId stream_id) {
QuicStream* stream = GetOrCreateStream(stream_id);
if (stream && stream->is_static()) {
- QUIC_BUG << "GetSpdyDataStream returns static stream " << stream_id;
+ QUIC_BUG << "GetOrCreateSpdyDataStream returns static stream " << stream_id;
connection()->CloseConnection(
QUIC_INVALID_STREAM_ID, QuicStrCat("stream ", stream_id, " is static"),
ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
diff --git a/quic/core/http/quic_spdy_session.h b/quic/core/http/quic_spdy_session.h
index 575d664..7e952c5 100644
--- a/quic/core/http/quic_spdy_session.h
+++ b/quic/core/http/quic_spdy_session.h
@@ -282,7 +282,7 @@
virtual QuicSpdyStream* CreateOutgoingBidirectionalStream() = 0;
virtual QuicSpdyStream* CreateOutgoingUnidirectionalStream() = 0;
- QuicSpdyStream* GetSpdyDataStream(const QuicStreamId stream_id);
+ QuicSpdyStream* GetOrCreateSpdyDataStream(const QuicStreamId stream_id);
// If an incoming stream can be created, return true.
virtual bool ShouldCreateIncomingStream(QuicStreamId id) = 0;
@@ -441,7 +441,7 @@
// If the endpoint has sent HTTP/3 GOAWAY frame.
bool http3_goaway_sent_;
- // If the sendpoint has sent the initial HTTP/3 MAX_PUSH_ID frame.
+ // If the endpoint has sent the initial HTTP/3 MAX_PUSH_ID frame.
bool http3_max_push_id_sent_;
};
