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 #include "content/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <map> | 9 #include <map> |
10 #include <utility> | 10 #include <utility> |
(...skipping 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1154 scoped_refptr<ResourceSchedulingFilter> filter( | 1154 scoped_refptr<ResourceSchedulingFilter> filter( |
1155 new ResourceSchedulingFilter( | 1155 new ResourceSchedulingFilter( |
1156 resource_task_queue2, resource_dispatcher())); | 1156 resource_task_queue2, resource_dispatcher())); |
1157 channel()->AddFilter(filter.get()); | 1157 channel()->AddFilter(filter.get()); |
1158 resource_dispatcher()->SetResourceSchedulingFilter(filter); | 1158 resource_dispatcher()->SetResourceSchedulingFilter(filter); |
1159 | 1159 |
1160 // The ChildResourceMessageFilter and the ResourceDispatcher need to use the | 1160 // The ChildResourceMessageFilter and the ResourceDispatcher need to use the |
1161 // same queue to ensure tasks are executed in the expected order. | 1161 // same queue to ensure tasks are executed in the expected order. |
1162 child_resource_message_filter()->SetMainThreadTaskRunner( | 1162 child_resource_message_filter()->SetMainThreadTaskRunner( |
1163 resource_task_queue2); | 1163 resource_task_queue2); |
1164 resource_dispatcher()->SetMainThreadTaskRunner(resource_task_queue2); | 1164 resource_dispatcher()->SetThreadTaskRunner(resource_task_queue2); |
1165 | 1165 |
1166 if (!command_line.HasSwitch(switches::kDisableThreadedCompositing)) | 1166 if (!command_line.HasSwitch(switches::kDisableThreadedCompositing)) |
1167 InitializeCompositorThread(); | 1167 InitializeCompositorThread(); |
1168 | 1168 |
1169 if (!input_event_filter_.get()) { | 1169 if (!input_event_filter_.get()) { |
1170 // Always provide an input event filter implementation to ensure consistent | 1170 // Always provide an input event filter implementation to ensure consistent |
1171 // input event scheduling and prioritization. | 1171 // input event scheduling and prioritization. |
1172 // TODO(jdduke): Merge InputEventFilter, InputHandlerManager and | 1172 // TODO(jdduke): Merge InputEventFilter, InputHandlerManager and |
1173 // MainThreadInputEventFilter, crbug.com/436057. | 1173 // MainThreadInputEventFilter, crbug.com/436057. |
1174 input_event_filter_ = new MainThreadInputEventFilter( | 1174 input_event_filter_ = new MainThreadInputEventFilter( |
(...skipping 1277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2452 } | 2452 } |
2453 } | 2453 } |
2454 | 2454 |
2455 void RenderThreadImpl::OnRendererInterfaceRequest( | 2455 void RenderThreadImpl::OnRendererInterfaceRequest( |
2456 mojom::RendererAssociatedRequest request) { | 2456 mojom::RendererAssociatedRequest request) { |
2457 DCHECK(!renderer_binding_.is_bound()); | 2457 DCHECK(!renderer_binding_.is_bound()); |
2458 renderer_binding_.Bind(std::move(request)); | 2458 renderer_binding_.Bind(std::move(request)); |
2459 } | 2459 } |
2460 | 2460 |
2461 } // namespace content | 2461 } // namespace content |
OLD | NEW |