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

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

Issue 2227083002: Remove net::BidirectionalStream::Cancel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typo Created 4 years, 4 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 3f25286e67f633a9d1854da01fddf003c89bfcbf..d115e40b9913281d9b36862383f188ee3c6912e4 100644
--- a/net/quic/chromium/bidirectional_stream_quic_impl.cc
+++ b/net/quic/chromium/bidirectional_stream_quic_impl.cc
@@ -42,7 +42,11 @@ BidirectionalStreamQuicImpl::BidirectionalStreamQuicImpl(
}
BidirectionalStreamQuicImpl::~BidirectionalStreamQuicImpl() {
- Cancel();
+ if (stream_) {
+ delegate_ = nullptr;
+ stream_->Reset(QUIC_STREAM_CANCELLED);
+ }
+
if (session_)
session_->RemoveObserver(this);
}
@@ -195,18 +199,6 @@ void BidirectionalStreamQuicImpl::SendvData(
}
}
-void BidirectionalStreamQuicImpl::Cancel() {
- if (delegate_) {
- delegate_ = nullptr;
- // Cancel any pending callbacks.
- weak_factory_.InvalidateWeakPtrs();
- }
- if (stream_) {
- stream_->Reset(QUIC_STREAM_CANCELLED);
- ResetStream();
- }
-}
-
NextProto BidirectionalStreamQuicImpl::GetProtocol() const {
return negotiated_protocol_;
}
« no previous file with comments | « net/quic/chromium/bidirectional_stream_quic_impl.h ('k') | net/quic/chromium/bidirectional_stream_quic_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698