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

Side by Side Diff: content/child/resource_dispatcher.cc

Issue 1366883002: [Reland] Post loading tasks on the appropriate WebFrameScheduler's queue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android compile Created 5 years, 2 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 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 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading 5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading
6 6
7 #include "content/child/resource_dispatcher.h" 7 #include "content/child/resource_dispatcher.h"
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/debug/alias.h" 12 #include "base/debug/alias.h"
13 #include "base/debug/dump_without_crashing.h" 13 #include "base/debug/dump_without_crashing.h"
14 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/memory/shared_memory.h" 15 #include "base/memory/shared_memory.h"
16 #include "base/message_loop/message_loop.h" 16 #include "base/message_loop/message_loop.h"
17 #include "base/metrics/histogram.h" 17 #include "base/metrics/histogram.h"
18 #include "base/strings/string_util.h" 18 #include "base/strings/string_util.h"
19 #include "content/child/request_extra_data.h" 19 #include "content/child/request_extra_data.h"
20 #include "content/child/request_info.h" 20 #include "content/child/request_info.h"
21 #include "content/child/resource_scheduling_filter.h"
21 #include "content/child/shared_memory_received_data_factory.h" 22 #include "content/child/shared_memory_received_data_factory.h"
22 #include "content/child/site_isolation_stats_gatherer.h" 23 #include "content/child/site_isolation_stats_gatherer.h"
23 #include "content/child/sync_load_response.h" 24 #include "content/child/sync_load_response.h"
24 #include "content/child/threaded_data_provider.h" 25 #include "content/child/threaded_data_provider.h"
25 #include "content/common/inter_process_time_ticks_converter.h" 26 #include "content/common/inter_process_time_ticks_converter.h"
26 #include "content/common/resource_messages.h" 27 #include "content/common/resource_messages.h"
27 #include "content/public/child/fixed_received_data.h" 28 #include "content/public/child/fixed_received_data.h"
28 #include "content/public/child/request_peer.h" 29 #include "content/public/child/request_peer.h"
29 #include "content/public/child/resource_dispatcher_delegate.h" 30 #include "content/public/child/resource_dispatcher_delegate.h"
30 #include "content/public/common/resource_response.h" 31 #include "content/public/common/resource_response.h"
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 bool release_downloaded_file = request_info.download_to_file; 397 bool release_downloaded_file = request_info.download_to_file;
397 398
398 ReleaseResourcesInMessageQueue(&request_info.deferred_message_queue); 399 ReleaseResourcesInMessageQueue(&request_info.deferred_message_queue);
399 pending_requests_.erase(it); 400 pending_requests_.erase(it);
400 401
401 if (release_downloaded_file) { 402 if (release_downloaded_file) {
402 message_sender_->Send( 403 message_sender_->Send(
403 new ResourceHostMsg_ReleaseDownloadedFile(request_id)); 404 new ResourceHostMsg_ReleaseDownloadedFile(request_id));
404 } 405 }
405 406
407 if (resource_scheduling_filter_.get())
408 resource_scheduling_filter_->ClearRequestIdTaskRunner(request_id);
409
406 return true; 410 return true;
407 } 411 }
408 412
409 void ResourceDispatcher::Cancel(int request_id) { 413 void ResourceDispatcher::Cancel(int request_id) {
410 PendingRequestList::iterator it = pending_requests_.find(request_id); 414 PendingRequestList::iterator it = pending_requests_.find(request_id);
411 if (it == pending_requests_.end()) { 415 if (it == pending_requests_.end()) {
412 DVLOG(1) << "unknown request"; 416 DVLOG(1) << "unknown request";
413 return; 417 return;
414 } 418 }
415 419
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 // Compute a unique request_id for this renderer process. 585 // Compute a unique request_id for this renderer process.
582 int request_id = MakeRequestID(); 586 int request_id = MakeRequestID();
583 pending_requests_[request_id] = 587 pending_requests_[request_id] =
584 PendingRequestInfo(peer, 588 PendingRequestInfo(peer,
585 request->resource_type, 589 request->resource_type,
586 request->origin_pid, 590 request->origin_pid,
587 frame_origin, 591 frame_origin,
588 request->url, 592 request->url,
589 request_info.download_to_file); 593 request_info.download_to_file);
590 594
595 if (resource_scheduling_filter_.get() &&
596 request_info.loading_web_task_runner) {
597 resource_scheduling_filter_->SetRequestIdTaskRunner(
598 request_id,
599 make_scoped_ptr(request_info.loading_web_task_runner->clone()));
600 }
601
591 message_sender_->Send(new ResourceHostMsg_RequestResource( 602 message_sender_->Send(new ResourceHostMsg_RequestResource(
592 request_info.routing_id, request_id, *request)); 603 request_info.routing_id, request_id, *request));
593 604
594 return request_id; 605 return request_id;
595 } 606 }
596 607
597 void ResourceDispatcher::ToResourceResponseInfo( 608 void ResourceDispatcher::ToResourceResponseInfo(
598 const PendingRequestInfo& request_info, 609 const PendingRequestInfo& request_info,
599 const ResourceResponseHead& browser_info, 610 const ResourceResponseHead& browser_info,
600 ResourceResponseInfo* renderer_info) const { 611 ResourceResponseInfo* renderer_info) const {
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 request->transferred_request_request_id = 798 request->transferred_request_request_id =
788 extra_data->transferred_request_request_id(); 799 extra_data->transferred_request_request_id();
789 request->service_worker_provider_id = 800 request->service_worker_provider_id =
790 extra_data->service_worker_provider_id(); 801 extra_data->service_worker_provider_id();
791 request->request_body = request_body; 802 request->request_body = request_body;
792 if (frame_origin) 803 if (frame_origin)
793 *frame_origin = extra_data->frame_origin(); 804 *frame_origin = extra_data->frame_origin();
794 return request.Pass(); 805 return request.Pass();
795 } 806 }
796 807
808 void ResourceDispatcher::SetResourceSchedulingFilter(
809 scoped_refptr<ResourceSchedulingFilter> resource_scheduling_filter) {
810 resource_scheduling_filter_ = resource_scheduling_filter;
811 }
812
797 } // namespace content 813 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698