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

Unified Diff: net/http/http_stream_factory_impl_job.h

Issue 1952423002: JobController 2: Remove reference between HttpStreamFactoryImpl::Jobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Job_Controller_1
Patch Set: move DoWaitForJob back, resume Job after delay in JobController Created 4 years, 7 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 | « no previous file | net/http/http_stream_factory_impl_job.cc » ('j') | net/http/http_stream_factory_impl_job.cc » ('J')
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 a6d23c436e7d51a62a7c8142f53d1ec0d8d3fc73..1ca55f02734760f4ca97026d6eea599e96a322f8 100644
--- a/net/http/http_stream_factory_impl_job.h
+++ b/net/http/http_stream_factory_impl_job.h
@@ -81,14 +81,14 @@ class HttpStreamFactoryImpl::Job {
int RestartTunnelWithProxyAuth(const AuthCredentials& credentials);
LoadState GetLoadState() const;
- // Tells |this| to wait for |job| to resume it.
- void WaitFor(Job* job);
-
// Tells |this| that |job| has determined it still needs to continue
// connecting, so allow |this| to continue after the specified |delay|. If
// this is not called, then |request_| is expected to cancel |this| by
// deleting it.
- void Resume(Job* job, const base::TimeDelta& delay);
+ void Resume(const base::TimeDelta& delay);
+
+ // Resume the |this| job after the specified |wait_time_|.
+ void ResumeAfterDelay(const base::TimeDelta& delay);
// Called to detach |this| Job. May resume the other Job, will disconnect
// the socket for |this| Job, and notify JobController upon completion.
@@ -215,9 +215,6 @@ class HttpStreamFactoryImpl::Job {
const bool is_spdy_alternative_;
};
- // Resume the |this| job after the specified |wait_time_|.
- void ResumeAfterDelay();
-
void OnStreamReadyCallback();
void OnBidirectionalStreamImplReadyCallback();
void OnWebSocketHandshakeStreamReadyCallback();
@@ -361,17 +358,6 @@ class HttpStreamFactoryImpl::Job {
JobType job_type_;
- // This is the Job we're dependent on. It will notify us if/when it's OK to
- // proceed.
- Job* blocking_job_;
-
- // |waiting_job_| is a Job waiting to see if |this| can reuse a connection.
- // If |this| is unable to do so, we'll notify |waiting_job_| that it's ok to
- // proceed and then race the two Jobs.
- Job* waiting_job_;
-
- base::TimeDelta wait_time_;
-
// True if handling a HTTPS request, or using SPDY with SSL
bool using_ssl_;
« no previous file with comments | « no previous file | net/http/http_stream_factory_impl_job.cc » ('j') | net/http/http_stream_factory_impl_job.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698