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

Unified Diff: net/http/http_stream_factory_impl_job.cc

Issue 1744693002: Implement QUIC-based net::BidirectionalStream (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@basecl
Patch Set: Removed dependency Created 4 years, 10 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/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index e5403f8dcdfac317441f1a4dfe67767123270f4d..bd26d4d8dd16a6bb5212f0db2689bba6343cfca6 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -1015,11 +1015,10 @@ int HttpStreamFactoryImpl::Job::DoInitConnection() {
destination = server_;
ssl_config = &server_ssl_config_;
}
-
- int rv =
- quic_request_.Request(destination, request_info_.privacy_mode,
- ssl_config->GetCertVerifyFlags(), url,
- request_info_.method, net_log_, io_callback_);
+ int rv = quic_request_.Request(destination, request_info_.privacy_mode,
+ ssl_config->GetCertVerifyFlags(), url,
+ request_info_.method, net_log_, io_callback_,
+ for_bidirectional_);
Ryan Hamilton 2016/03/03 04:14:57 Let's use HttpStreamRequest::StreamType stream_typ
xunjieli 2016/03/03 16:54:19 Done.
if (rv == OK) {
using_existing_quic_session_ = true;
} else {
@@ -1257,7 +1256,15 @@ int HttpStreamFactoryImpl::Job::DoInitConnectionComplete(int result) {
MaybeMarkAlternativeServiceBroken();
return result;
}
- stream_ = quic_request_.ReleaseStream();
+ if (for_bidirectional_) {
+#if BUILDFLAG(ENABLE_BIDIRECTIONAL_STREAM)
+ bidirectional_stream_job_ = quic_request_.ReleaseBidirectionalStreamJob();
+#else
+ NOTREACHED();
+#endif
Ryan Hamilton 2016/03/03 04:14:57 I don't want to keep harping on this, but this is
xunjieli 2016/03/03 16:54:19 After changing for_bidirectional_ to the enum, is
+ } else {
+ stream_ = quic_request_.ReleaseStream();
+ }
next_state_ = STATE_NONE;
return OK;
}

Powered by Google App Engine
This is Rietveld 408576698