| Index: cc/scheduler.h
|
| diff --git a/cc/scheduler.h b/cc/scheduler.h
|
| index eee40efd94924d02850f94c26e7c401e8ec77077..f6d05546a11287875e2695132681f18c334e933f 100644
|
| --- a/cc/scheduler.h
|
| +++ b/cc/scheduler.h
|
| @@ -16,6 +16,7 @@
|
| namespace cc {
|
|
|
| class Thread;
|
| +class LayerTreeSettings;
|
|
|
| struct ScheduledActionDrawAndSwapResult {
|
| ScheduledActionDrawAndSwapResult()
|
| @@ -49,9 +50,11 @@ protected:
|
|
|
| class CC_EXPORT Scheduler : FrameRateControllerClient {
|
| public:
|
| - static scoped_ptr<Scheduler> create(SchedulerClient* client, scoped_ptr<FrameRateController> frameRateController)
|
| + static scoped_ptr<Scheduler> create(SchedulerClient* client,
|
| + scoped_ptr<FrameRateController> frameRateController,
|
| + const LayerTreeSettings &layerTreeSettings)
|
| {
|
| - return make_scoped_ptr(new Scheduler(client, frameRateController.Pass()));
|
| + return make_scoped_ptr(new Scheduler(client, frameRateController.Pass(), layerTreeSettings));
|
| }
|
|
|
| virtual ~Scheduler();
|
| @@ -95,12 +98,14 @@ public:
|
| virtual void vsyncTick(bool throttled) OVERRIDE;
|
|
|
| private:
|
| - Scheduler(SchedulerClient*, scoped_ptr<FrameRateController>);
|
| + Scheduler(SchedulerClient*, scoped_ptr<FrameRateController>,
|
| + const LayerTreeSettings &layerTreeSettings);
|
|
|
| void processScheduledActions();
|
|
|
| SchedulerClient* m_client;
|
| scoped_ptr<FrameRateController> m_frameRateController;
|
| + const LayerTreeSettings& m_layerTreeSettings;
|
| SchedulerStateMachine m_stateMachine;
|
| bool m_insideProcessScheduledActions;
|
|
|
|
|