| Index: cc/CCScheduler.cpp
|
| diff --git a/cc/CCScheduler.cpp b/cc/CCScheduler.cpp
|
| index 9eb483f32c14e2fb19c6f04e9f9b6f9ee5106a32..91a2ee52908e97f560ceac5dfb60250c46ed3c20 100644
|
| --- a/cc/CCScheduler.cpp
|
| +++ b/cc/CCScheduler.cpp
|
| @@ -23,7 +23,7 @@ CCScheduler::CCScheduler(CCSchedulerClient* client, PassOwnPtr<CCFrameRateContro
|
|
|
| CCScheduler::~CCScheduler()
|
| {
|
| - m_frameRateController->setActive(false);
|
| + m_frameRateController->setActive(false, false);
|
| }
|
|
|
| void CCScheduler::setCanBeginFrame(bool can)
|
| @@ -185,8 +185,14 @@ void CCScheduler::processScheduledActions()
|
| }
|
|
|
| // Activate or deactivate the frame rate controller.
|
| - m_frameRateController->setActive(m_stateMachine.vsyncCallbackNeeded());
|
| + m_frameRateController->setActive(m_stateMachine.vsyncCallbackNeeded(),
|
| + m_stateMachine.commitPending());
|
| m_client->didAnticipatedDrawTimeChange(m_frameRateController->nextTickTime());
|
| }
|
|
|
| +void CCScheduler::renderingStats(CCRenderingStats* stats) const
|
| +{
|
| + m_frameRateController->renderingStats(stats);
|
| +}
|
| +
|
| }
|
|
|