Index: content/renderer/render_thread_impl.cc |
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
index 88a572fa9e6e0299df28354b89905c15c5783662..ec080f904a5b24dbb2e639e2c64f4d46d3918c3a 100644 |
--- a/content/renderer/render_thread_impl.cc |
+++ b/content/renderer/render_thread_impl.cc |
@@ -851,7 +851,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(); |
@@ -861,6 +860,14 @@ void RenderThreadImpl::EnsureWebKitInitialized() { |
const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
+ if (command_line.HasSwitch(switches::kDisableBlinkScheduler)) { |
+ main_thread_compositor_task_runner_ = base::MessageLoopProxy::current(); |
+ } else { |
+ main_thread_compositor_task_runner_ = |
+ make_scoped_refptr(new SchedulerProxyTaskRunner< |
+ &blink::WebSchedulerProxy::postCompositorTask>()); |
+ } |
+ |
bool enable = !command_line.HasSwitch(switches::kDisableThreadedCompositing); |
if (enable) { |
#if defined(OS_ANDROID) |