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 <vector> | 10 #include <vector> |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 #include "content/renderer/media/midi_message_filter.h" | 85 #include "content/renderer/media/midi_message_filter.h" |
86 #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h" | 86 #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h" |
87 #include "content/renderer/media/video_capture_impl_manager.h" | 87 #include "content/renderer/media/video_capture_impl_manager.h" |
88 #include "content/renderer/media/video_capture_message_filter.h" | 88 #include "content/renderer/media/video_capture_message_filter.h" |
89 #include "content/renderer/net_info_helper.h" | 89 #include "content/renderer/net_info_helper.h" |
90 #include "content/renderer/p2p/socket_dispatcher.h" | 90 #include "content/renderer/p2p/socket_dispatcher.h" |
91 #include "content/renderer/render_frame_proxy.h" | 91 #include "content/renderer/render_frame_proxy.h" |
92 #include "content/renderer/render_process_impl.h" | 92 #include "content/renderer/render_process_impl.h" |
93 #include "content/renderer/render_view_impl.h" | 93 #include "content/renderer/render_view_impl.h" |
94 #include "content/renderer/renderer_blink_platform_impl.h" | 94 #include "content/renderer/renderer_blink_platform_impl.h" |
| 95 #include "content/renderer/scheduler/task_queue_manager.h" |
95 #include "content/renderer/scheduler_proxy_task_runner.h" | 96 #include "content/renderer/scheduler_proxy_task_runner.h" |
96 #include "content/renderer/service_worker/embedded_worker_context_message_filter
.h" | 97 #include "content/renderer/service_worker/embedded_worker_context_message_filter
.h" |
97 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" | 98 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" |
98 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h" | 99 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h" |
99 #include "ipc/ipc_channel_handle.h" | 100 #include "ipc/ipc_channel_handle.h" |
100 #include "ipc/ipc_forwarding_message_filter.h" | 101 #include "ipc/ipc_forwarding_message_filter.h" |
101 #include "ipc/ipc_platform_file.h" | 102 #include "ipc/ipc_platform_file.h" |
102 #include "media/base/audio_hardware_config.h" | 103 #include "media/base/audio_hardware_config.h" |
103 #include "media/base/media.h" | 104 #include "media/base/media.h" |
104 #include "media/filters/gpu_video_accelerator_factories.h" | 105 #include "media/filters/gpu_video_accelerator_factories.h" |
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
844 ResourceDispatcherDelegate* delegate) { | 845 ResourceDispatcherDelegate* delegate) { |
845 resource_dispatcher()->set_delegate(delegate); | 846 resource_dispatcher()->set_delegate(delegate); |
846 } | 847 } |
847 | 848 |
848 void RenderThreadImpl::EnsureWebKitInitialized() { | 849 void RenderThreadImpl::EnsureWebKitInitialized() { |
849 if (blink_platform_impl_) | 850 if (blink_platform_impl_) |
850 return; | 851 return; |
851 | 852 |
852 blink_platform_impl_.reset(new RendererBlinkPlatformImpl); | 853 blink_platform_impl_.reset(new RendererBlinkPlatformImpl); |
853 blink::initialize(blink_platform_impl_.get()); | 854 blink::initialize(blink_platform_impl_.get()); |
854 main_thread_compositor_task_runner_ = base::MessageLoopProxy::current(); | 855 main_thread_compositor_task_runner_ = |
| 856 blink_platform_impl_->task_queue_manager()->TaskRunnerForQueue( |
| 857 TaskQueueManager::kCompositorTaskQueue); |
855 | 858 |
856 v8::Isolate* isolate = blink::mainThreadIsolate(); | 859 v8::Isolate* isolate = blink::mainThreadIsolate(); |
857 | 860 |
858 isolate->SetCounterFunction(base::StatsTable::FindLocation); | 861 isolate->SetCounterFunction(base::StatsTable::FindLocation); |
859 isolate->SetCreateHistogramFunction(CreateHistogram); | 862 isolate->SetCreateHistogramFunction(CreateHistogram); |
860 isolate->SetAddHistogramSampleFunction(AddHistogramSample); | 863 isolate->SetAddHistogramSampleFunction(AddHistogramSample); |
861 | 864 |
862 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 865 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
863 | 866 |
864 bool enable = !command_line.HasSwitch(switches::kDisableThreadedCompositing); | 867 bool enable = !command_line.HasSwitch(switches::kDisableThreadedCompositing); |
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1632 hidden_widget_count_--; | 1635 hidden_widget_count_--; |
1633 | 1636 |
1634 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1637 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
1635 return; | 1638 return; |
1636 } | 1639 } |
1637 | 1640 |
1638 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1641 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
1639 } | 1642 } |
1640 | 1643 |
1641 } // namespace content | 1644 } // namespace content |
OLD | NEW |