OLD | NEW |
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 <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
597 request_info.routing_id, request_id, *request)); | 597 request_info.routing_id, request_id, *request)); |
598 | 598 |
599 return request_id; | 599 return request_id; |
600 } | 600 } |
601 | 601 |
602 void ResourceDispatcher::ToResourceResponseInfo( | 602 void ResourceDispatcher::ToResourceResponseInfo( |
603 const PendingRequestInfo& request_info, | 603 const PendingRequestInfo& request_info, |
604 const ResourceResponseHead& browser_info, | 604 const ResourceResponseHead& browser_info, |
605 ResourceResponseInfo* renderer_info) const { | 605 ResourceResponseInfo* renderer_info) const { |
606 *renderer_info = browser_info; | 606 *renderer_info = browser_info; |
607 if (request_info.request_start.is_null() || | 607 if (base::TimeTicks::IsConsistentAcrossProcesses() || |
| 608 request_info.request_start.is_null() || |
608 request_info.response_start.is_null() || | 609 request_info.response_start.is_null() || |
609 browser_info.request_start.is_null() || | 610 browser_info.request_start.is_null() || |
610 browser_info.response_start.is_null() || | 611 browser_info.response_start.is_null() || |
611 browser_info.load_timing.request_start.is_null()) { | 612 browser_info.load_timing.request_start.is_null()) { |
612 return; | 613 return; |
613 } | 614 } |
614 InterProcessTimeTicksConverter converter( | 615 InterProcessTimeTicksConverter converter( |
615 LocalTimeTicks::FromTimeTicks(request_info.request_start), | 616 LocalTimeTicks::FromTimeTicks(request_info.request_start), |
616 LocalTimeTicks::FromTimeTicks(request_info.response_start), | 617 LocalTimeTicks::FromTimeTicks(request_info.response_start), |
617 RemoteTimeTicks::FromTimeTicks(browser_info.request_start), | 618 RemoteTimeTicks::FromTimeTicks(browser_info.request_start), |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
808 *frame_origin = extra_data->frame_origin(); | 809 *frame_origin = extra_data->frame_origin(); |
809 return request; | 810 return request; |
810 } | 811 } |
811 | 812 |
812 void ResourceDispatcher::SetResourceSchedulingFilter( | 813 void ResourceDispatcher::SetResourceSchedulingFilter( |
813 scoped_refptr<ResourceSchedulingFilter> resource_scheduling_filter) { | 814 scoped_refptr<ResourceSchedulingFilter> resource_scheduling_filter) { |
814 resource_scheduling_filter_ = resource_scheduling_filter; | 815 resource_scheduling_filter_ = resource_scheduling_filter; |
815 } | 816 } |
816 | 817 |
817 } // namespace content | 818 } // namespace content |
OLD | NEW |