Prevent QUIC subclasses from accessing stream_map_.size(). No behavior change. not protected. PiperOrigin-RevId: 324674633 Change-Id: Iaac67b21a154be167b1f404a4f4d3b83bff72a38
diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc index 2948371..e025706 100644 --- a/quic/core/http/quic_spdy_session.cc +++ b/quic/core/http/quic_spdy_session.cc
@@ -1178,8 +1178,8 @@ } bool QuicSpdySession::HasActiveRequestStreams() const { - DCHECK_GE(static_cast<size_t>(stream_map().size()), num_static_streams()); - return stream_map().size() - num_static_streams() > 0; + DCHECK_GE(static_cast<size_t>(stream_map_size()), num_static_streams()); + return stream_map_size() - num_static_streams() > 0; } bool QuicSpdySession::ProcessPendingStream(PendingStream* pending) {
diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc index 68fde60..5b825ed 100644 --- a/quic/core/quic_session.cc +++ b/quic/core/quic_session.cc
@@ -1975,6 +1975,8 @@ stream_id_manager_.num_open_outgoing_streams() - locally_closed_streams_highest_offset_.size(); } + DCHECK_GE(static_cast<QuicStreamCount>(stream_map_.size()), + num_static_streams_ + num_draining_streams_); return stream_map_.size() - num_draining_streams_ - num_static_streams_; }
diff --git a/quic/core/quic_session.h b/quic/core/quic_session.h index 9566ea1..a49726e 100644 --- a/quic/core/quic_session.h +++ b/quic/core/quic_session.h
@@ -563,7 +563,9 @@ } StreamMap& stream_map() { return stream_map_; } - const StreamMap& stream_map() const { return stream_map_; } + + // TODO(b/136274541): remove this getter and only expose GetNumActiveStreams() + QuicStreamCount stream_map_size() const { return stream_map_.size(); } const PendingStreamMap& pending_streams() const { return pending_stream_map_;
diff --git a/quic/qbone/qbone_client_session.cc b/quic/qbone/qbone_client_session.cc index 98d8a51..2e5d205 100644 --- a/quic/qbone/qbone_client_session.cc +++ b/quic/qbone/qbone_client_session.cc
@@ -94,7 +94,7 @@ const ProofVerifyDetails& verify_details) {} bool QboneClientSession::HasActiveRequests() const { - return (stream_map().size() - num_static_streams()) > 0; + return (stream_map_size() - num_static_streams()) > 0; } } // namespace quic