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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 #include "content/renderer/media/midi_message_filter.h" | 84 #include "content/renderer/media/midi_message_filter.h" |
85 #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h" | 85 #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h" |
86 #include "content/renderer/media/video_capture_impl_manager.h" | 86 #include "content/renderer/media/video_capture_impl_manager.h" |
87 #include "content/renderer/media/video_capture_message_filter.h" | 87 #include "content/renderer/media/video_capture_message_filter.h" |
88 #include "content/renderer/net_info_helper.h" | 88 #include "content/renderer/net_info_helper.h" |
89 #include "content/renderer/p2p/socket_dispatcher.h" | 89 #include "content/renderer/p2p/socket_dispatcher.h" |
90 #include "content/renderer/render_frame_proxy.h" | 90 #include "content/renderer/render_frame_proxy.h" |
91 #include "content/renderer/render_process_impl.h" | 91 #include "content/renderer/render_process_impl.h" |
92 #include "content/renderer/render_view_impl.h" | 92 #include "content/renderer/render_view_impl.h" |
93 #include "content/renderer/renderer_blink_platform_impl.h" | 93 #include "content/renderer/renderer_blink_platform_impl.h" |
| 94 #include "content/renderer/scheduler/renderer_scheduler.h" |
94 #include "content/renderer/service_worker/embedded_worker_context_message_filter
.h" | 95 #include "content/renderer/service_worker/embedded_worker_context_message_filter
.h" |
95 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" | 96 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" |
96 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h" | 97 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h" |
97 #include "ipc/ipc_channel_handle.h" | 98 #include "ipc/ipc_channel_handle.h" |
98 #include "ipc/ipc_forwarding_message_filter.h" | 99 #include "ipc/ipc_forwarding_message_filter.h" |
99 #include "ipc/ipc_platform_file.h" | 100 #include "ipc/ipc_platform_file.h" |
100 #include "ipc/mojo/ipc_channel_mojo.h" | 101 #include "ipc/mojo/ipc_channel_mojo.h" |
101 #include "media/base/audio_hardware_config.h" | 102 #include "media/base/audio_hardware_config.h" |
102 #include "media/base/media.h" | 103 #include "media/base/media.h" |
103 #include "media/filters/gpu_video_accelerator_factories.h" | 104 #include "media/filters/gpu_video_accelerator_factories.h" |
(...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
839 blink::initialize(blink_platform_impl_.get()); | 840 blink::initialize(blink_platform_impl_.get()); |
840 | 841 |
841 v8::Isolate* isolate = blink::mainThreadIsolate(); | 842 v8::Isolate* isolate = blink::mainThreadIsolate(); |
842 | 843 |
843 isolate->SetCounterFunction(base::StatsTable::FindLocation); | 844 isolate->SetCounterFunction(base::StatsTable::FindLocation); |
844 isolate->SetCreateHistogramFunction(CreateHistogram); | 845 isolate->SetCreateHistogramFunction(CreateHistogram); |
845 isolate->SetAddHistogramSampleFunction(AddHistogramSample); | 846 isolate->SetAddHistogramSampleFunction(AddHistogramSample); |
846 | 847 |
847 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 848 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
848 | 849 |
849 main_thread_compositor_task_runner_ = base::MessageLoopProxy::current(); | 850 main_thread_compositor_task_runner_ = |
| 851 blink_platform_impl_->renderer_scheduler()->CompositorTaskRunner(); |
850 | 852 |
851 bool enable = !command_line.HasSwitch(switches::kDisableThreadedCompositing); | 853 bool enable = !command_line.HasSwitch(switches::kDisableThreadedCompositing); |
852 if (enable) { | 854 if (enable) { |
853 #if defined(OS_ANDROID) | 855 #if defined(OS_ANDROID) |
854 if (SynchronousCompositorFactory* factory = | 856 if (SynchronousCompositorFactory* factory = |
855 SynchronousCompositorFactory::GetInstance()) | 857 SynchronousCompositorFactory::GetInstance()) |
856 compositor_message_loop_proxy_ = | 858 compositor_message_loop_proxy_ = |
857 factory->GetCompositorMessageLoop(); | 859 factory->GetCompositorMessageLoop(); |
858 #endif | 860 #endif |
859 if (!compositor_message_loop_proxy_.get()) { | 861 if (!compositor_message_loop_proxy_.get()) { |
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1578 hidden_widget_count_--; | 1580 hidden_widget_count_--; |
1579 | 1581 |
1580 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1582 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
1581 return; | 1583 return; |
1582 } | 1584 } |
1583 | 1585 |
1584 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1586 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
1585 } | 1587 } |
1586 | 1588 |
1587 } // namespace content | 1589 } // namespace content |
OLD | NEW |