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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 #include "content/renderer/media/midi_message_filter.h" | 86 #include "content/renderer/media/midi_message_filter.h" |
87 #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h" | 87 #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h" |
88 #include "content/renderer/media/video_capture_impl_manager.h" | 88 #include "content/renderer/media/video_capture_impl_manager.h" |
89 #include "content/renderer/media/video_capture_message_filter.h" | 89 #include "content/renderer/media/video_capture_message_filter.h" |
90 #include "content/renderer/net_info_helper.h" | 90 #include "content/renderer/net_info_helper.h" |
91 #include "content/renderer/p2p/socket_dispatcher.h" | 91 #include "content/renderer/p2p/socket_dispatcher.h" |
92 #include "content/renderer/render_frame_proxy.h" | 92 #include "content/renderer/render_frame_proxy.h" |
93 #include "content/renderer/render_process_impl.h" | 93 #include "content/renderer/render_process_impl.h" |
94 #include "content/renderer/render_view_impl.h" | 94 #include "content/renderer/render_view_impl.h" |
95 #include "content/renderer/renderer_blink_platform_impl.h" | 95 #include "content/renderer/renderer_blink_platform_impl.h" |
| 96 #include "content/renderer/scheduler/renderer_scheduler.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 "ipc/mojo/ipc_channel_mojo.h" | 103 #include "ipc/mojo/ipc_channel_mojo.h" |
103 #include "media/base/audio_hardware_config.h" | 104 #include "media/base/audio_hardware_config.h" |
104 #include "media/base/media.h" | 105 #include "media/base/media.h" |
105 #include "media/filters/gpu_video_accelerator_factories.h" | 106 #include "media/filters/gpu_video_accelerator_factories.h" |
(...skipping 738 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
844 blink::initialize(blink_platform_impl_.get()); | 845 blink::initialize(blink_platform_impl_.get()); |
845 | 846 |
846 v8::Isolate* isolate = blink::mainThreadIsolate(); | 847 v8::Isolate* isolate = blink::mainThreadIsolate(); |
847 | 848 |
848 isolate->SetCounterFunction(base::StatsTable::FindLocation); | 849 isolate->SetCounterFunction(base::StatsTable::FindLocation); |
849 isolate->SetCreateHistogramFunction(CreateHistogram); | 850 isolate->SetCreateHistogramFunction(CreateHistogram); |
850 isolate->SetAddHistogramSampleFunction(AddHistogramSample); | 851 isolate->SetAddHistogramSampleFunction(AddHistogramSample); |
851 | 852 |
852 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 853 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
853 | 854 |
854 main_thread_compositor_task_runner_ = base::MessageLoopProxy::current(); | 855 main_thread_compositor_task_runner_ = |
| 856 blink_platform_impl_->renderer_scheduler()->CompositorTaskRunner(); |
855 | 857 |
856 bool enable = !command_line.HasSwitch(switches::kDisableThreadedCompositing); | 858 bool enable = !command_line.HasSwitch(switches::kDisableThreadedCompositing); |
857 if (enable) { | 859 if (enable) { |
858 #if defined(OS_ANDROID) | 860 #if defined(OS_ANDROID) |
859 if (SynchronousCompositorFactory* factory = | 861 if (SynchronousCompositorFactory* factory = |
860 SynchronousCompositorFactory::GetInstance()) | 862 SynchronousCompositorFactory::GetInstance()) |
861 compositor_message_loop_proxy_ = | 863 compositor_message_loop_proxy_ = |
862 factory->GetCompositorMessageLoop(); | 864 factory->GetCompositorMessageLoop(); |
863 #endif | 865 #endif |
864 if (!compositor_message_loop_proxy_.get()) { | 866 if (!compositor_message_loop_proxy_.get()) { |
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1584 hidden_widget_count_--; | 1586 hidden_widget_count_--; |
1585 | 1587 |
1586 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1588 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
1587 return; | 1589 return; |
1588 } | 1590 } |
1589 | 1591 |
1590 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1592 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
1591 } | 1593 } |
1592 | 1594 |
1593 } // namespace content | 1595 } // namespace content |
OLD | NEW |