| Index: cc/CCScheduler.h
|
| diff --git a/cc/CCScheduler.h b/cc/CCScheduler.h
|
| index fb043ac70c40056693d2a8413611928450933913..5cabee99ab765302615dd53594303e34e297c7e3 100644
|
| --- a/cc/CCScheduler.h
|
| +++ b/cc/CCScheduler.h
|
| @@ -32,8 +32,6 @@ struct CCScheduledActionDrawAndSwapResult {
|
|
|
| class CCSchedulerClient {
|
| public:
|
| - virtual bool hasMoreResourceUpdates() const = 0;
|
| -
|
| virtual void scheduledActionBeginFrame() = 0;
|
| virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapIfPossible() = 0;
|
| virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapForced() = 0;
|
| @@ -73,7 +71,7 @@ public:
|
| // Like setNeedsRedraw(), but ensures the draw will definitely happen even if we are not visible.
|
| void setNeedsForcedRedraw();
|
|
|
| - void beginFrameComplete();
|
| + void beginFrameComplete(bool hasResourceUpdates);
|
| void beginFrameAborted();
|
|
|
| void setMaxFramesPending(int);
|
| @@ -91,6 +89,8 @@ public:
|
| // CCFrameRateControllerClient implementation
|
| virtual void vsyncTick() OVERRIDE;
|
|
|
| + void updateResourcesComplete();
|
| +
|
| private:
|
| CCScheduler(CCSchedulerClient*, PassOwnPtr<CCFrameRateController>);
|
|
|
| @@ -99,6 +99,7 @@ private:
|
| CCSchedulerClient* m_client;
|
| OwnPtr<CCFrameRateController> m_frameRateController;
|
| CCSchedulerStateMachine m_stateMachine;
|
| + bool m_hasMoreResourceUpdates;
|
| bool m_updateMoreResourcesPending;
|
| };
|
|
|
|
|