Commit 64c0685a authored by Zhongyi Shi's avatar Zhongyi Shi Committed by Commit Bot

Override OnCanCreateNewOutgoingStream in QuicChromiumClientSession.

This is a follw-up change after merge internal change 219177525.

Change-Id: I1ac9774d34c631b8ef3f71e86edd5d7c104c67da
Reviewed-on: https://chromium-review.googlesource.com/c/1327801
Commit-Queue: Zhongyi Shi <zhongyi@chromium.org>
Reviewed-by: default avatarRyan Hamilton <rch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607033}
parent 1eb1dbc5
...@@ -1318,7 +1318,6 @@ void QuicChromiumClientSession::CloseStream(quic::QuicStreamId stream_id) { ...@@ -1318,7 +1318,6 @@ void QuicChromiumClientSession::CloseStream(quic::QuicStreamId stream_id) {
} }
} }
quic::QuicSpdySession::CloseStream(stream_id); quic::QuicSpdySession::CloseStream(stream_id);
OnClosedStream();
} }
void QuicChromiumClientSession::SendRstStream( void QuicChromiumClientSession::SendRstStream(
...@@ -1334,10 +1333,9 @@ void QuicChromiumClientSession::SendRstStream( ...@@ -1334,10 +1333,9 @@ void QuicChromiumClientSession::SendRstStream(
} }
} }
quic::QuicSpdySession::SendRstStream(id, error, bytes_written); quic::QuicSpdySession::SendRstStream(id, error, bytes_written);
OnClosedStream();
} }
void QuicChromiumClientSession::OnClosedStream() { void QuicChromiumClientSession::OnCanCreateNewOutgoingStream() {
if (GetNumOpenOutgoingStreams() < max_open_outgoing_streams() && if (GetNumOpenOutgoingStreams() < max_open_outgoing_streams() &&
!stream_requests_.empty() && crypto_stream_->encryption_established() && !stream_requests_.empty() && crypto_stream_->encryption_established() &&
!goaway_received() && !going_away_ && connection()->connected()) { !goaway_received() && !going_away_ && connection()->connected()) {
...@@ -1468,7 +1466,9 @@ void QuicChromiumClientSession::OnGoAway(const quic::QuicGoAwayFrame& frame) { ...@@ -1468,7 +1466,9 @@ void QuicChromiumClientSession::OnGoAway(const quic::QuicGoAwayFrame& frame) {
void QuicChromiumClientSession::OnRstStream( void QuicChromiumClientSession::OnRstStream(
const quic::QuicRstStreamFrame& frame) { const quic::QuicRstStreamFrame& frame) {
quic::QuicSession::OnRstStream(frame); quic::QuicSession::OnRstStream(frame);
OnClosedStream(); // TODO(zhongyi): remove the call to OnCanCreateNewOutgoingStream when
// b/119278038 is fixed and the bugfix is merged to chromium.
OnCanCreateNewOutgoingStream();
} }
void QuicChromiumClientSession::OnConnectionClosed( void QuicChromiumClientSession::OnConnectionClosed(
......
...@@ -476,6 +476,7 @@ class NET_EXPORT_PRIVATE QuicChromiumClientSession ...@@ -476,6 +476,7 @@ class NET_EXPORT_PRIVATE QuicChromiumClientSession
const quic::CryptoHandshakeMessage& message) override; const quic::CryptoHandshakeMessage& message) override;
void OnGoAway(const quic::QuicGoAwayFrame& frame) override; void OnGoAway(const quic::QuicGoAwayFrame& frame) override;
void OnRstStream(const quic::QuicRstStreamFrame& frame) override; void OnRstStream(const quic::QuicRstStreamFrame& frame) override;
void OnCanCreateNewOutgoingStream() override;
// QuicClientSessionBase methods: // QuicClientSessionBase methods:
void OnConfigNegotiated() override; void OnConfigNegotiated() override;
...@@ -666,8 +667,6 @@ class NET_EXPORT_PRIVATE QuicChromiumClientSession ...@@ -666,8 +667,6 @@ class NET_EXPORT_PRIVATE QuicChromiumClientSession
// A completion callback invoked when a read completes. // A completion callback invoked when a read completes.
void OnReadComplete(int result); void OnReadComplete(int result);
void OnClosedStream();
void CloseAllStreams(int net_error); void CloseAllStreams(int net_error);
void CloseAllHandles(int net_error); void CloseAllHandles(int net_error);
void CancelAllRequests(int net_error); void CancelAllRequests(int net_error);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment