diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-19 21:01:36 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-19 21:01:36 +0000 |
| commit | 262eec8f3436504b5d6c9ea60fd2b9314b3cd495 (patch) | |
| tree | 108e937f5e46b6828d62ca89c29446919002b1f6 /net/url_request | |
| parent | 821572b27b959ab6fa5457cb41562dd7f2c48ab2 (diff) | |
| download | chromium_src-262eec8f3436504b5d6c9ea60fd2b9314b3cd495.zip chromium_src-262eec8f3436504b5d6c9ea60fd2b9314b3cd495.tar.gz chromium_src-262eec8f3436504b5d6c9ea60fd2b9314b3cd495.tar.bz2 | |
[Net] Separate out priority field from HttpRequestInfo
This is in preparation for supporting reprioritization; HttpRequestInfo
is assumed to be an unchanging struct, so priority can't live in it
if it is something that can change.
Also add DEFAULT_PRIORITY value and replace some uses of LOWEST with it.
BUG=166689
Review URL: https://codereview.chromium.org/12833008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
| -rw-r--r-- | net/url_request/url_request.cc | 4 | ||||
| -rw-r--r-- | net/url_request/url_request_ftp_job.cc | 3 | ||||
| -rw-r--r-- | net/url_request/url_request_http_job.cc | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc index 9eb2b4a..5e426d1 100644 --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc @@ -151,7 +151,7 @@ URLRequest::URLRequest(const GURL& url, is_pending_(false), is_redirecting_(false), redirect_limit_(kMaxRedirects), - priority_(LOWEST), + priority_(DEFAULT_PRIORITY), identifier_(GenerateURLRequestIdentifier()), blocked_on_delegate_(false), ALLOW_THIS_IN_INITIALIZER_LIST(before_request_callback_( @@ -190,7 +190,7 @@ URLRequest::URLRequest(const GURL& url, is_pending_(false), is_redirecting_(false), redirect_limit_(kMaxRedirects), - priority_(LOWEST), + priority_(DEFAULT_PRIORITY), identifier_(GenerateURLRequestIdentifier()), blocked_on_delegate_(false), ALLOW_THIS_IN_INITIALIZER_LIST(before_request_callback_( diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc index 343c4d7..ebb540d 100644 --- a/net/url_request/url_request_ftp_job.cc +++ b/net/url_request/url_request_ftp_job.cc @@ -165,11 +165,10 @@ void URLRequestFtpJob::StartHttpTransaction() { http_request_info_.url = request_->url(); http_request_info_.method = request_->method(); http_request_info_.load_flags = request_->load_flags(); - http_request_info_.priority = request_->priority(); http_request_info_.request_id = request_->identifier(); int rv = request_->context()->http_transaction_factory()->CreateTransaction( - &http_transaction_, NULL); + request_->priority(), &http_transaction_, NULL); if (rv == OK) { rv = http_transaction_->Start( &http_request_info_, diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index 716fe4c..fcf296b 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -394,7 +394,7 @@ void URLRequestHttpJob::StartTransactionInternal() { DCHECK(request_->context()->http_transaction_factory()); rv = request_->context()->http_transaction_factory()->CreateTransaction( - &transaction_, http_transaction_delegate_.get()); + request_->priority(), &transaction_, http_transaction_delegate_.get()); if (rv == OK) { if (!throttling_entry_ || !throttling_entry_->ShouldRejectRequest(*request_)) { @@ -868,7 +868,6 @@ void URLRequestHttpJob::Start() { request_info_.url = request_->url(); request_info_.method = request_->method(); request_info_.load_flags = request_->load_flags(); - request_info_.priority = request_->priority(); request_info_.request_id = request_->identifier(); // Strip Referer from request_info_.extra_headers to prevent, e.g., plugins |