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

Unified Diff: net/http/http_stream_factory_impl_job.h

Issue 871753006: Add AlternateProtocolInfo to HttpStreamFactoryImpl::Job. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « net/http/http_stream_factory_impl.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_job.h
diff --git a/net/http/http_stream_factory_impl_job.h b/net/http/http_stream_factory_impl_job.h
index 55bfeecc9f96376a318803faa54a3039d5773c96..68b369a5f5277bd0d91523e796271ebb8836469d 100644
--- a/net/http/http_stream_factory_impl_job.h
+++ b/net/http/http_stream_factory_impl_job.h
@@ -41,7 +41,8 @@ class HttpStreamFactoryImpl::Job {
RequestPriority priority,
const SSLConfig& server_ssl_config,
const SSLConfig& proxy_ssl_config,
- NetLog* net_log);
+ NetLog* net_log,
+ AlternateProtocolInfo alternate_protocol);
Ryan Hamilton 2015/01/30 23:12:51 I'm not sure that I'm a fan of moving this to the
Bence 2015/01/31 00:32:01 Well, if you look at https://codereview.chromium.o
Ryan Hamilton 2015/01/31 01:17:48 I'm not sure that's the best way to accomplish thi
Bence 2015/02/02 15:08:17 Excellent idea! Done.
~Job();
// Start initiates the process of creating a new HttpStream. |request| will be
@@ -57,10 +58,8 @@ class HttpStreamFactoryImpl::Job {
// Marks this Job as the "alternate" job, from Alternate-Protocol. Tracks the
// original url so we can mark the Alternate-Protocol as broken if
- // we fail to connect. |alternate| specifies the alternate protocol to use
- // and alternate port to connect to.
- void MarkAsAlternate(const GURL& original_url,
- AlternateProtocolInfo alternate);
+ // we fail to connect.
+ void MarkAsAlternate(const GURL& original_url);
// Tells |this| to wait for |job| to resume it.
void WaitFor(Job* job);
@@ -275,6 +274,10 @@ class HttpStreamFactoryImpl::Job {
// and will specify the original URL.
scoped_ptr<GURL> original_url_;
+ // AlternateProtocol for the alternate job (regardless of whether it is this
+ // job or not).
+ AlternateProtocolInfo alternate_protocol_;
+
// This is the Job we're dependent on. It will notify us if/when it's OK to
// proceed.
Job* blocking_job_;
« no previous file with comments | « net/http/http_stream_factory_impl.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698