Index: cc/scheduler.cc |
diff --git a/cc/scheduler.cc b/cc/scheduler.cc |
index 644241482b968996438bc82c3a862946087a06bb..f25a883220bc944b7e03af87c8908dcfd2e7d185 100644 |
--- a/cc/scheduler.cc |
+++ b/cc/scheduler.cc |
@@ -10,9 +10,18 @@ |
namespace cc { |
-Scheduler::Scheduler(SchedulerClient* client, scoped_ptr<FrameRateController> frameRateController) |
- : m_client(client) |
+SchedulerSettings::SchedulerSettings() |
+ : implSidePainting(false) |
+{ |
+} |
+ |
+Scheduler::Scheduler(SchedulerClient* client, |
+ scoped_ptr<FrameRateController> frameRateController, |
+ const SchedulerSettings& schedulerSettings) |
+ : m_settings(schedulerSettings) |
+ , m_client(client) |
, m_frameRateController(frameRateController.Pass()) |
+ , m_stateMachine(&m_settings) |
, m_insideProcessScheduledActions(false) |
{ |
DCHECK(m_client); |