summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-04 21:18:24 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-04 21:18:24 +0000
commit9b37c0533449d599cf8fc770572b467de61b2992 (patch)
tree4895897af423c7de66a7ae732ad263083f0f4df2 /webkit
parent38fc8fb026c3d42ce5df3cc25b7295e4c1a8bf60 (diff)
downloadchromium_src-9b37c0533449d599cf8fc770572b467de61b2992.zip
chromium_src-9b37c0533449d599cf8fc770572b467de61b2992.tar.gz
chromium_src-9b37c0533449d599cf8fc770572b467de61b2992.tar.bz2
[Net] Assert that URLRequests with LOAD_IGNORE_LIMITS have MAXIMUM_PRIORITY
Also remove the priority juggling in ClientSocketPoolBaseHelper, and instead assert that any requests with ignore_limits = true also has priority = MAXIMUM_PRIORITY. BUG=166689 R=asanka@chromium.org, gene@chromium.org, joaodasilva@chromium.org, mmenke@chromium.org, simonjam@chromium.org TBR=benm@chromium.org, jamesr@chromium.org Review URL: https://codereview.chromium.org/51683002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232802 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/browser/appcache/appcache_update_job.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/browser/appcache/appcache_update_job.cc b/webkit/browser/appcache/appcache_update_job.cc
index e4f14de..17e3bef 100644
--- a/webkit/browser/appcache/appcache_update_job.cc
+++ b/webkit/browser/appcache/appcache_update_job.cc
@@ -108,8 +108,8 @@ AppCacheUpdateJob::URLFetcher::~URLFetcher() {
void AppCacheUpdateJob::URLFetcher::Start() {
request_->set_first_party_for_cookies(job_->manifest_url_);
- request_->set_load_flags(request_->load_flags() |
- net::LOAD_DISABLE_INTERCEPT);
+ request_->SetLoadFlags(request_->load_flags() |
+ net::LOAD_DISABLE_INTERCEPT);
if (existing_response_headers_.get())
AddConditionalHeaders(existing_response_headers_.get());
request_->Start();