Index: content/renderer/render_thread_impl.cc |
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
index 55812846af3b46eaa526b84f84330b96379dfa87..769d5e38cd20a16db71615c298b98ea2a1b9959c 100644 |
--- a/content/renderer/render_thread_impl.cc |
+++ b/content/renderer/render_thread_impl.cc |
@@ -839,7 +839,6 @@ void RenderThreadImpl::EnsureWebKitInitialized() { |
blink_platform_impl_.reset(new RendererBlinkPlatformImpl); |
blink::initialize(blink_platform_impl_.get()); |
- main_thread_compositor_task_runner_ = base::MessageLoopProxy::current(); |
v8::Isolate* isolate = blink::mainThreadIsolate(); |
@@ -849,6 +848,14 @@ void RenderThreadImpl::EnsureWebKitInitialized() { |
const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
+ if (!command_line.HasSwitch(switches::kDisableBlinkScheduler)) { |
+ main_thread_compositor_task_runner_ = |
+ make_scoped_refptr(new SchedulerProxyTaskRunner< |
+ &blink::WebSchedulerProxy::postCompositorTask>()); |
+ } else { |
+ main_thread_compositor_task_runner_ = base::MessageLoopProxy::current(); |
+ } |
+ |
picksi1
2014/10/08 12:44:37
Stylistic Nit: I'd favor swapping the if/else and
Sami
2014/10/08 12:54:32
Done.
|
bool enable = !command_line.HasSwitch(switches::kDisableThreadedCompositing); |
if (enable) { |
#if defined(OS_ANDROID) |