Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(184)

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 664963002: content: Add RendererScheduler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Daniel and Jared's comments and move renderer_scheduler ownership to render_thread_impl Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 hidden_widget_count_ = 0; 433 hidden_widget_count_ = 0;
433 idle_notification_delay_in_ms_ = kInitialIdleHandlerDelayMs; 434 idle_notification_delay_in_ms_ = kInitialIdleHandlerDelayMs;
434 idle_notifications_to_skip_ = 0; 435 idle_notifications_to_skip_ = 0;
435 layout_test_mode_ = false; 436 layout_test_mode_ = false;
436 437
437 appcache_dispatcher_.reset( 438 appcache_dispatcher_.reset(
438 new AppCacheDispatcher(Get(), new AppCacheFrontendImpl())); 439 new AppCacheDispatcher(Get(), new AppCacheFrontendImpl()));
439 dom_storage_dispatcher_.reset(new DomStorageDispatcher()); 440 dom_storage_dispatcher_.reset(new DomStorageDispatcher());
440 main_thread_indexed_db_dispatcher_.reset(new IndexedDBDispatcher( 441 main_thread_indexed_db_dispatcher_.reset(new IndexedDBDispatcher(
441 thread_safe_sender())); 442 thread_safe_sender()));
443 renderer_scheduler_ = RendererScheduler::Create();
442 embedded_worker_dispatcher_.reset(new EmbeddedWorkerDispatcher()); 444 embedded_worker_dispatcher_.reset(new EmbeddedWorkerDispatcher());
443 445
444 media_stream_center_ = NULL; 446 media_stream_center_ = NULL;
445 447
446 db_message_filter_ = new DBMessageFilter(); 448 db_message_filter_ = new DBMessageFilter();
447 AddFilter(db_message_filter_.get()); 449 AddFilter(db_message_filter_.get());
448 450
449 vc_manager_.reset(new VideoCaptureImplManager()); 451 vc_manager_.reset(new VideoCaptureImplManager());
450 AddFilter(vc_manager_->video_capture_message_filter()); 452 AddFilter(vc_manager_->video_capture_message_filter());
451 453
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 835
834 void RenderThreadImpl::SetResourceDispatcherDelegate( 836 void RenderThreadImpl::SetResourceDispatcherDelegate(
835 ResourceDispatcherDelegate* delegate) { 837 ResourceDispatcherDelegate* delegate) {
836 resource_dispatcher()->set_delegate(delegate); 838 resource_dispatcher()->set_delegate(delegate);
837 } 839 }
838 840
839 void RenderThreadImpl::EnsureWebKitInitialized() { 841 void RenderThreadImpl::EnsureWebKitInitialized() {
840 if (blink_platform_impl_) 842 if (blink_platform_impl_)
841 return; 843 return;
842 844
843 blink_platform_impl_.reset(new RendererBlinkPlatformImpl); 845 blink_platform_impl_.reset(
846 new RendererBlinkPlatformImpl(renderer_scheduler_.get()));
844 blink::initialize(blink_platform_impl_.get()); 847 blink::initialize(blink_platform_impl_.get());
845 848
846 v8::Isolate* isolate = blink::mainThreadIsolate(); 849 v8::Isolate* isolate = blink::mainThreadIsolate();
847 850
848 isolate->SetCounterFunction(base::StatsTable::FindLocation); 851 isolate->SetCounterFunction(base::StatsTable::FindLocation);
849 isolate->SetCreateHistogramFunction(CreateHistogram); 852 isolate->SetCreateHistogramFunction(CreateHistogram);
850 isolate->SetAddHistogramSampleFunction(AddHistogramSample); 853 isolate->SetAddHistogramSampleFunction(AddHistogramSample);
851 854
852 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 855 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
853 856
854 main_thread_compositor_task_runner_ = base::MessageLoopProxy::current(); 857 main_thread_compositor_task_runner_ =
858 renderer_scheduler()->CompositorTaskRunner();
Sami 2014/11/04 17:46:35 indent += 2
rmcilroy 2014/11/05 00:34:00 Done.
855 859
856 bool enable = !command_line.HasSwitch(switches::kDisableThreadedCompositing); 860 bool enable = !command_line.HasSwitch(switches::kDisableThreadedCompositing);
857 if (enable) { 861 if (enable) {
858 #if defined(OS_ANDROID) 862 #if defined(OS_ANDROID)
859 if (SynchronousCompositorFactory* factory = 863 if (SynchronousCompositorFactory* factory =
860 SynchronousCompositorFactory::GetInstance()) 864 SynchronousCompositorFactory::GetInstance())
861 compositor_message_loop_proxy_ = 865 compositor_message_loop_proxy_ =
862 factory->GetCompositorMessageLoop(); 866 factory->GetCompositorMessageLoop();
863 #endif 867 #endif
864 if (!compositor_message_loop_proxy_.get()) { 868 if (!compositor_message_loop_proxy_.get()) {
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
1586 hidden_widget_count_--; 1590 hidden_widget_count_--;
1587 1591
1588 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { 1592 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) {
1589 return; 1593 return;
1590 } 1594 }
1591 1595
1592 ScheduleIdleHandler(kLongIdleHandlerDelayMs); 1596 ScheduleIdleHandler(kLongIdleHandlerDelayMs);
1593 } 1597 }
1594 1598
1595 } // namespace content 1599 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698