| Index: cc/CCDelayBasedTimeSource.cpp
|
| diff --git a/cc/CCDelayBasedTimeSource.cpp b/cc/CCDelayBasedTimeSource.cpp
|
| index 6e34a074a2e824d4eb892fa7f88832083a654009..0582ecd3e5729bce42fe4f0dbbfa3806b75d4231 100644
|
| --- a/cc/CCDelayBasedTimeSource.cpp
|
| +++ b/cc/CCDelayBasedTimeSource.cpp
|
| @@ -92,7 +92,7 @@ base::TimeTicks CCDelayBasedTimeSource::nextTickTime()
|
|
|
| void CCDelayBasedTimeSource::onTimerFired()
|
| {
|
| - ASSERT(m_state != STATE_INACTIVE);
|
| + DCHECK(m_state != STATE_INACTIVE);
|
|
|
| base::TimeTicks now = this->now();
|
| m_lastTickTime = now;
|
| @@ -204,7 +204,7 @@ base::TimeTicks CCDelayBasedTimeSource::nextTickTarget(base::TimeTicks now)
|
| int intervalsElapsed = static_cast<int>(floor((now - m_nextParameters.tickTarget).InSecondsF() / newInterval.InSecondsF()));
|
| base::TimeTicks lastEffectiveTick = m_nextParameters.tickTarget + newInterval * intervalsElapsed;
|
| base::TimeTicks newTickTarget = lastEffectiveTick + newInterval;
|
| - ASSERT(newTickTarget > now);
|
| + DCHECK(newTickTarget > now);
|
|
|
| // Avoid double ticks when:
|
| // 1) Turning off the timer and turning it right back on.
|
| @@ -221,7 +221,7 @@ void CCDelayBasedTimeSource::postNextTickTask(base::TimeTicks now)
|
|
|
| // Post another task *before* the tick and update state
|
| base::TimeDelta delay = newTickTarget - now;
|
| - ASSERT(delay.InMillisecondsF() <=
|
| + DCHECK(delay.InMillisecondsF() <=
|
| m_nextParameters.interval.InMillisecondsF() * (1.0 + doubleTickThreshold));
|
| m_timer.startOneShot(delay.InSecondsF());
|
|
|
|
|