| Index: cc/CCFrameRateController.cpp
|
| diff --git a/cc/CCFrameRateController.cpp b/cc/CCFrameRateController.cpp
|
| index 25d4d7e4cd45d2e53e8fb3203f90720c437ca705..d143a850cd27cbe486007a86513844644f425aa6 100644
|
| --- a/cc/CCFrameRateController.cpp
|
| +++ b/cc/CCFrameRateController.cpp
|
| @@ -90,10 +90,10 @@ void CCFrameRateController::setMaxFramesPending(int maxFramesPending)
|
| m_maxFramesPending = maxFramesPending;
|
| }
|
|
|
| -void CCFrameRateController::setTimebaseAndInterval(double timebase, double intervalSeconds)
|
| +void CCFrameRateController::setTimebaseAndInterval(base::TimeTicks timebase, base::TimeDelta interval)
|
| {
|
| if (m_isTimeSourceThrottling)
|
| - m_timeSource->setTimebaseAndInterval(timebase, intervalSeconds);
|
| + m_timeSource->setTimebaseAndInterval(timebase, interval);
|
| }
|
|
|
| void CCFrameRateController::setSwapBuffersCompleteSupported(bool supported)
|
| @@ -151,12 +151,12 @@ void CCFrameRateController::didAbortAllPendingFrames()
|
| m_numFramesPending = 0;
|
| }
|
|
|
| -double CCFrameRateController::nextTickTimeIfActivated()
|
| +base::TimeTicks CCFrameRateController::nextTickTimeIfActivated()
|
| {
|
| if (m_isTimeSourceThrottling)
|
| return m_timeSource->nextTickTimeIfActivated();
|
|
|
| - return monotonicallyIncreasingTime();
|
| + return base::TimeTicks::Now();
|
| }
|
|
|
| }
|
|
|