Index: content/renderer/scheduler/renderer_scheduler.cc |
diff --git a/content/renderer/scheduler/renderer_scheduler.cc b/content/renderer/scheduler/renderer_scheduler.cc |
index ec30f7f5eb9f26b4d74ed194d60009c7f5fa7d10..815f61a51ce954105e92e7d1e1780bb14a67182e 100644 |
--- a/content/renderer/scheduler/renderer_scheduler.cc |
+++ b/content/renderer/scheduler/renderer_scheduler.cc |
@@ -4,7 +4,11 @@ |
#include "content/renderer/scheduler/renderer_scheduler.h" |
+#include "base/command_line.h" |
+#include "base/message_loop/message_loop_proxy.h" |
+#include "content/public/common/content_switches.h" |
#include "content/renderer/scheduler/null_renderer_scheduler.h" |
+#include "content/renderer/scheduler/renderer_scheduler_impl.h" |
namespace content { |
@@ -16,8 +20,13 @@ RendererScheduler::~RendererScheduler() { |
// static |
scoped_ptr<RendererScheduler> RendererScheduler::Create() { |
- // TODO(rmcilroy): Use the RendererSchedulerImpl when the scheduler is enabled |
- return make_scoped_ptr(new NullRendererScheduler()); |
+ CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
+ if (command_line->HasSwitch(switches::kDisableBlinkScheduler)) { |
+ return make_scoped_ptr(new NullRendererScheduler()); |
+ } else { |
+ return make_scoped_ptr( |
+ new RendererSchedulerImpl(base::MessageLoopProxy::current())); |
+ } |
} |
} // namespace content |