Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(977)

Unified Diff: net/quic/chromium/bidirectional_stream_quic_impl.cc

Issue 2393233002: Remove OnDataAvailable() notification when trailers are to be delivered (Closed)
Patch Set: Address Andrei's comments Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/quic/chromium/bidirectional_stream_quic_impl.cc
diff --git a/net/quic/chromium/bidirectional_stream_quic_impl.cc b/net/quic/chromium/bidirectional_stream_quic_impl.cc
index 7645f8a36b0ed0071c90163eb8ae7e8fbdb5b85d..0fb1119f5700407871a8d315faf92282cc19145a 100644
--- a/net/quic/chromium/bidirectional_stream_quic_impl.cc
+++ b/net/quic/chromium/bidirectional_stream_quic_impl.cc
@@ -246,8 +246,15 @@ void BidirectionalStreamQuicImpl::OnHeadersAvailable(
// BidirectionalStreamQuicImpl::OnClose().
stream_->OnFinRead();
}
- if (delegate_)
- delegate_->OnTrailersReceived(headers);
+ if (!delegate_)
+ return;
+ // Complete any remaining read. The task is posted because
+ // |delegate_|->OnTrailersReceived() might destroy |this|.
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE, base::Bind(&BidirectionalStreamQuicImpl::OnDataAvailable,
+ weak_factory_.GetWeakPtr()));
+ delegate_->OnTrailersReceived(headers);
+ // |this| can be destroyed after this point.
}
}
@@ -256,8 +263,6 @@ void BidirectionalStreamQuicImpl::OnDataAvailable() {
if (!read_buffer_)
return;
- CHECK(read_buffer_);
- CHECK_NE(0, read_buffer_len_);
int rv = ReadData(read_buffer_.get(), read_buffer_len_);
if (rv == ERR_IO_PENDING) {
// Spurrious notification. Wait for the next one.
« no previous file with comments | « no previous file | net/quic/chromium/bidirectional_stream_quic_impl_unittest.cc » ('j') | net/quic/core/quic_spdy_stream.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698