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

Side by Side Diff: content/browser/loader/resource_scheduler.cc

Issue 2535723005: Stop using ResourceController in ResourceThrottle (Closed)
Patch Set: Addressed #62 Created 4 years 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/loader/resource_scheduler.h" 5 #include "content/browser/loader/resource_scheduler.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/feature_list.h" 13 #include "base/feature_list.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/metrics/field_trial.h" 15 #include "base/metrics/field_trial.h"
16 #include "base/metrics/histogram_macros.h" 16 #include "base/metrics/histogram_macros.h"
17 #include "base/stl_util.h" 17 #include "base/stl_util.h"
18 #include "base/supports_user_data.h" 18 #include "base/supports_user_data.h"
19 #include "content/common/resource_messages.h" 19 #include "content/common/resource_messages.h"
20 #include "content/public/browser/resource_controller.h"
21 #include "content/public/browser/resource_request_info.h" 20 #include "content/public/browser/resource_request_info.h"
22 #include "content/public/browser/resource_throttle.h" 21 #include "content/public/browser/resource_throttle.h"
23 #include "net/base/host_port_pair.h" 22 #include "net/base/host_port_pair.h"
24 #include "net/base/load_flags.h" 23 #include "net/base/load_flags.h"
25 #include "net/base/request_priority.h" 24 #include "net/base/request_priority.h"
26 #include "net/http/http_server_properties.h" 25 #include "net/http/http_server_properties.h"
27 #include "net/url_request/url_request.h" 26 #include "net/url_request/url_request.h"
28 #include "net/url_request/url_request_context.h" 27 #include "net/url_request/url_request_context.h"
29 #include "url/scheme_host_port.h" 28 #include "url/scheme_host_port.h"
30 29
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 // request. 210 // request.
212 if (start_mode == START_ASYNC) { 211 if (start_mode == START_ASYNC) {
213 base::ThreadTaskRunnerHandle::Get()->PostTask( 212 base::ThreadTaskRunnerHandle::Get()->PostTask(
214 FROM_HERE, 213 FROM_HERE,
215 base::Bind(&ScheduledResourceRequest::Start, 214 base::Bind(&ScheduledResourceRequest::Start,
216 weak_ptr_factory_.GetWeakPtr(), 215 weak_ptr_factory_.GetWeakPtr(),
217 START_SYNC)); 216 START_SYNC));
218 return; 217 return;
219 } 218 }
220 deferred_ = false; 219 deferred_ = false;
221 controller()->Resume(); 220 Resume();
222 } 221 }
223 222
224 ready_ = true; 223 ready_ = true;
225 } 224 }
226 225
227 void set_request_priority_params(const RequestPriorityParams& priority) { 226 void set_request_priority_params(const RequestPriorityParams& priority) {
228 priority_ = priority; 227 priority_ = priority;
229 } 228 }
230 const RequestPriorityParams& get_request_priority_params() const { 229 const RequestPriorityParams& get_request_priority_params() const {
231 return priority_; 230 return priority_;
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 client->ReprioritizeRequest(scheduled_resource_request, old_priority_params, 914 client->ReprioritizeRequest(scheduled_resource_request, old_priority_params,
916 new_priority_params); 915 new_priority_params);
917 } 916 }
918 917
919 ResourceScheduler::ClientId ResourceScheduler::MakeClientId( 918 ResourceScheduler::ClientId ResourceScheduler::MakeClientId(
920 int child_id, int route_id) { 919 int child_id, int route_id) {
921 return (static_cast<ResourceScheduler::ClientId>(child_id) << 32) | route_id; 920 return (static_cast<ResourceScheduler::ClientId>(child_id) << 32) | route_id;
922 } 921 }
923 922
924 } // namespace content 923 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_unittest.cc ('k') | content/browser/loader/resource_scheduler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698