| Index: cc/scheduler.cc
|
| diff --git a/cc/scheduler.cc b/cc/scheduler.cc
|
| index 644241482b968996438bc82c3a862946087a06bb..5d198f8290e0b6289636c6140be7959872f2b635 100644
|
| --- a/cc/scheduler.cc
|
| +++ b/cc/scheduler.cc
|
| @@ -7,12 +7,17 @@
|
| #include "base/auto_reset.h"
|
| #include "base/debug/trace_event.h"
|
| #include "base/logging.h"
|
| +#include "cc/layer_tree_settings.h"
|
|
|
| namespace cc {
|
|
|
| -Scheduler::Scheduler(SchedulerClient* client, scoped_ptr<FrameRateController> frameRateController)
|
| +Scheduler::Scheduler(SchedulerClient* client,
|
| + scoped_ptr<FrameRateController> frameRateController,
|
| + const LayerTreeSettings& layerTreeSettings)
|
| : m_client(client)
|
| , m_frameRateController(frameRateController.Pass())
|
| + , m_layerTreeSettings(layerTreeSettings)
|
| + , m_stateMachine(layerTreeSettings)
|
| , m_insideProcessScheduledActions(false)
|
| {
|
| DCHECK(m_client);
|
|
|