cc: Chromify TimeSource, DelayBasedTimeSource and test

cc/scheduler/delay_based_time_source.cc

Index: cc/scheduler/delay_based_time_source.cc
diff --git a/cc/scheduler/delay_based_time_source.cc b/cc/scheduler/delay_based_time_source.cc
index f7fb1b7f6e18cd348e99ee199e0e8fe9a5f05dc9..48cd31d03d0983c7d17ff19a6c5d47c8d1360dab 100644
--- a/cc/scheduler/delay_based_time_source.cc
+++ b/cc/scheduler/delay_based_time_source.cc
@@ -16,219 +16,228 @@ namespace cc {
 
 namespace {
 
-// doubleTickThreshold prevents ticks from running within the specified fraction of an interval.
-// This helps account for jitter in the timebase as well as quick timer reactivation.
-const double doubleTickThreshold = 0.25;
-
-// intervalChangeThreshold is the fraction of the interval that will trigger an immediate interval change.
-// phaseChangeThreshold is the fraction of the interval that will trigger an immediate phase change.
-// If the changes are within the thresholds, the change will take place on the next tick.
-// If either change is outside the thresholds, the next tick will be canceled and reissued immediately.
-const double intervalChangeThreshold = 0.25;
-const double phaseChangeThreshold = 0.25;
+// kDoubleTickThreshold prevents ticks from running within the specified
+// fraction of an interval.  This helps account for jitter in the timebase as
+// well as quick timer reactivation.
+static const double kDoubleTickThreshold = 0.25;
+
+// kIntervalChangeThreshold is the fraction of the interval that will trigger an
+// immediate interval change.  kPhaseChangeThreshold is the fraction of the
+// interval that will trigger an immediate phase change.  If the changes are
+// within the thresholds, the change will take place on the next tick.  If
+// either change is outside the thresholds, the next tick will be canceled and
+// reissued immediately.
+static const double kIntervalChangeThreshold = 0.25;
+static const double kPhaseChangeThreshold = 0.25;
 
 }  // namespace
 
-scoped_refptr<DelayBasedTimeSource> DelayBasedTimeSource::create(base::TimeDelta interval, Thread* thread)
-{
-    return make_scoped_refptr(new DelayBasedTimeSource(interval, thread));
-}
-
-DelayBasedTimeSource::DelayBasedTimeSource(base::TimeDelta interval, Thread* thread)
-    : m_client(0)
-    , m_hasTickTarget(false)
-    , m_currentParameters(interval, base::TimeTicks())
-    , m_nextParameters(interval, base::TimeTicks())
-    , m_state(STATE_INACTIVE)
-    , m_thread(thread)
-    , m_weakFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this))
-{
+scoped_refptr<DelayBasedTimeSource> DelayBasedTimeSource::Create(
+    base::TimeDelta interval,
+    Thread* thread) {
+  return make_scoped_refptr(new DelayBasedTimeSource(interval, thread));
 }
 
-DelayBasedTimeSource::~DelayBasedTimeSource()
-{
+DelayBasedTimeSource::DelayBasedTimeSource(base::TimeDelta interval,
+                                           Thread* thread)
+    : client_(NULL),
+      has_tick_target_(false),
+      current_parameters_(interval, base::TimeTicks()),
+      next_parameters_(interval, base::TimeTicks()),
+      state_(STATE_INACTIVE),
+      thread_(thread),
+      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
+
+DelayBasedTimeSource::~DelayBasedTimeSource() {}
+
+void DelayBasedTimeSource::SetActive(bool active) {
+  TRACE_EVENT1("cc", "DelayBasedTimeSource::setActive", "active", active);
+  if (!active) {
+    state_ = STATE_INACTIVE;
+    weak_factory_.InvalidateWeakPtrs();
+    return;
+  }
+
+  if (state_ == STATE_STARTING || state_ == STATE_ACTIVE)
+    return;
+
+  if (!has_tick_target_) {
+    // Becoming active the first time is deferred: we post a 0-delay task.
+    // When it runs, we use that to establish the timebase, become truly
+    // active, and fire the first tick.
+    state_ = STATE_STARTING;
+    thread_->PostTask(base::Bind(&DelayBasedTimeSource::OnTimerFired,
+                                 weak_factory_.GetWeakPtr()));
+    return;
+  }
+
+  state_ = STATE_ACTIVE;
+
+  PostNextTickTask(Now());
 }
 
-void DelayBasedTimeSource::setActive(bool active)
-{
-    TRACE_EVENT1("cc", "DelayBasedTimeSource::setActive", "active", active);
-    if (!active) {
-        m_state = STATE_INACTIVE;
-        m_weakFactory.InvalidateWeakPtrs();
-        return;
-    }
-
-    if (m_state == STATE_STARTING || m_state == STATE_ACTIVE)
-        return;
-
-    if (!m_hasTickTarget) {
-        // Becoming active the first time is deferred: we post a 0-delay task. When
-        // it runs, we use that to establish the timebase, become truly active, and
-        // fire the first tick.
-        m_state = STATE_STARTING;
-        m_thread->PostTask(base::Bind(&DelayBasedTimeSource::onTimerFired, m_weakFactory.GetWeakPtr()));
-        return;
-    }
-
-    m_state = STATE_ACTIVE;
-
-    postNextTickTask(now());
-}
+bool DelayBasedTimeSource::Active() const { return state_ != STATE_INACTIVE; }
 
-bool DelayBasedTimeSource::active() const
-{
-    return m_state != STATE_INACTIVE;
-}
-
-base::TimeTicks DelayBasedTimeSource::lastTickTime()
-{
-    return m_lastTickTime;
-}
+base::TimeTicks DelayBasedTimeSource::LastTickTime() { return last_tick_time_; }
 
-base::TimeTicks DelayBasedTimeSource::nextTickTime()
-{
-    return active() ? m_currentParameters.tickTarget : base::TimeTicks();
+base::TimeTicks DelayBasedTimeSource::NextTickTime() {
+  return Active() ? current_parameters_.tick_target : base::TimeTicks();
 }
 
-void DelayBasedTimeSource::onTimerFired()
-{
-    DCHECK(m_state != STATE_INACTIVE);
+void DelayBasedTimeSource::OnTimerFired() {
+  DCHECK(state_ != STATE_INACTIVE);
 
-    base::TimeTicks now = this->now();
-    m_lastTickTime = now;
+  base::TimeTicks now = this->Now();
+  last_tick_time_ = now;
 
-    if (m_state == STATE_STARTING) {
-        setTimebaseAndInterval(now, m_currentParameters.interval);
-        m_state = STATE_ACTIVE;
-    }
+  if (state_ == STATE_STARTING) {
+    SetTimebaseAndInterval(now, current_parameters_.interval);
+    state_ = STATE_ACTIVE;
+  }
 
-    postNextTickTask(now);
+  PostNextTickTask(now);
 
-    // Fire the tick
-    if (m_client)
-        m_client->onTimerTick();
+  // Fire the tick.
+  if (client_)
+    client_->OnTimerTick();
 }
 
-void DelayBasedTimeSource::setClient(TimeSourceClient* client)
-{
-    m_client = client;
+void DelayBasedTimeSource::SetClient(TimeSourceClient* client) {
+  client_ = client;
 }
 
-void DelayBasedTimeSource::setTimebaseAndInterval(base::TimeTicks timebase, base::TimeDelta interval)
-{
-    m_nextParameters.interval = interval;
-    m_nextParameters.tickTarget = timebase;
-    m_hasTickTarget = true;
-
-    if (m_state != STATE_ACTIVE) {
-        // If we aren't active, there's no need to reset the timer.
-        return;
-    }
-
-    // If the change in interval is larger than the change threshold,
-    // request an immediate reset.
-    double intervalDelta = std::abs((interval - m_currentParameters.interval).InSecondsF());
-    double intervalChange = intervalDelta / interval.InSecondsF();
-    if (intervalChange > intervalChangeThreshold) {
-        setActive(false);
-        setActive(true);
-        return;
-    }
-
-    // If the change in phase is greater than the change threshold in either
-    // direction, request an immediate reset. This logic might result in a false
-    // negative if there is a simultaneous small change in the interval and the
-    // fmod just happens to return something near zero. Assuming the timebase
-    // is very recent though, which it should be, we'll still be ok because the
-    // old clock and new clock just happen to line up.
-    double targetDelta = std::abs((timebase - m_currentParameters.tickTarget).InSecondsF());
-    double phaseChange = fmod(targetDelta, interval.InSecondsF()) / interval.InSecondsF();
-    if (phaseChange > phaseChangeThreshold && phaseChange < (1.0 - phaseChangeThreshold)) {
-        setActive(false);
-        setActive(true);
-        return;
-    }
+void DelayBasedTimeSource::SetTimebaseAndInterval(base::TimeTicks timebase,
+                                                  base::TimeDelta interval) {
+  next_parameters_.interval = interval;
+  next_parameters_.tick_target = timebase;
+  has_tick_target_ = true;
+
+  if (state_ != STATE_ACTIVE) {
+    // If we aren't active, there's no need to reset the timer.
+    return;
+  }
+
+  // If the change in interval is larger than the change threshold,
+  // request an immediate reset.
+  double interval_delta =
+      std::abs((interval - current_parameters_.interval).InSecondsF());
+  double interval_change = interval_delta / interval.InSecondsF();
+  if (interval_change > kIntervalChangeThreshold) {
+    SetActive(false);
+    SetActive(true);
+    return;
+  }
+
+  // If the change in phase is greater than the change threshold in either
+  // direction, request an immediate reset. This logic might result in a false
+  // negative if there is a simultaneous small change in the interval and the
+  // fmod just happens to return something near zero. Assuming the timebase
+  // is very recent though, which it should be, we'll still be ok because the
+  // old clock and new clock just happen to line up.
+  double target_delta =
+      std::abs((timebase - current_parameters_.tick_target).InSecondsF());
+  double phase_change =
+      fmod(target_delta, interval.InSecondsF()) / interval.InSecondsF();
+  if (phase_change > kPhaseChangeThreshold &&
+      phase_change < (1.0 - kPhaseChangeThreshold)) {
+    SetActive(false);
+    SetActive(true);
+    return;
+  }
 }
 
-base::TimeTicks DelayBasedTimeSource::now() const
-{
-    return base::TimeTicks::Now();
+base::TimeTicks DelayBasedTimeSource::Now() const {
+  return base::TimeTicks::Now();
 }
 
-// This code tries to achieve an average tick rate as close to m_interval as possible.
-// To do this, it has to deal with a few basic issues:
-//   1. postDelayedTask can delay only at a millisecond granularity. So, 16.666 has to
-//      posted as 16 or 17.
-//   2. A delayed task may come back a bit late (a few ms), or really late (frames later)
+// This code tries to achieve an average tick rate as close to interval_ as
+// possible.  To do this, it has to deal with a few basic issues:
+//   1. postDelayedTask can delay only at a millisecond granularity. So, 16.666
+//   has to posted as 16 or 17.
+//   2. A delayed task may come back a bit late (a few ms), or really late
+//   (frames later)
 //
-// The basic idea with this scheduler here is to keep track of where we *want* to run in
-// m_tickTarget. We update this with the exact interval.
+// The basic idea with this scheduler here is to keep track of where we *want*
+// to run in tick_target_. We update this with the exact interval.
 //
-// Then, when we post our task, we take the floor of (m_tickTarget and now()). If we
-// started at now=0, and 60FPs (all times in milliseconds):
+// Then, when we post our task, we take the floor of (tick_target_ and Now()).
+// If we started at now=0, and 60FPs (all times in milliseconds):
 //      now=0    target=16.667   postDelayedTask(16)
 //
-// When our callback runs, we figure out how far off we were from that goal. Because of the flooring
-// operation, and assuming our timer runs exactly when it should, this yields:
+// When our callback runs, we figure out how far off we were from that goal.
+// Because of the flooring operation, and assuming our timer runs exactly when
+// it should, this yields:
 //      now=16   target=16.667
 //
-// Since we can't post a 0.667 ms task to get to now=16, we just treat this as a tick. Then,
-// we update target to be 33.333. We now post another task based on the difference between our target
-// and now:
-//      now=16   tickTarget=16.667  newTarget=33.333   --> postDelayedTask(floor(33.333 - 16)) --> postDelayedTask(17)
+// Since we can't post a 0.667 ms task to get to now=16, we just treat this as a
+// tick. Then, we update target to be 33.333. We now post another task based on
+// the difference between our target and now:
+//      now=16   tick_target=16.667  newTarget=33.333   -->
+//          postDelayedTask(floor(33.333 - 16)) --> postDelayedTask(17)
 //
 // Over time, with no late tasks, this leads to us posting tasks like this:
-//      now=0    tickTarget=0       newTarget=16.667   --> tick(), postDelayedTask(16)
-//      now=16   tickTarget=16.667  newTarget=33.333   --> tick(), postDelayedTask(17)
-//      now=33   tickTarget=33.333  newTarget=50.000   --> tick(), postDelayedTask(17)
-//      now=50   tickTarget=50.000  newTarget=66.667   --> tick(), postDelayedTask(16)
+//      now=0    tick_target=0       newTarget=16.667   -->
+//          tick(), postDelayedTask(16)
+//      now=16   tick_target=16.667  newTarget=33.333   -->
+//          tick(), postDelayedTask(17)
+//      now=33   tick_target=33.333  newTarget=50.000   -->
+//          tick(), postDelayedTask(17)
+//      now=50   tick_target=50.000  newTarget=66.667   -->
+//          tick(), postDelayedTask(16)
 //
-// We treat delays in tasks differently depending on the amount of delay we encounter. Suppose we
-// posted a task with a target=16.667:
+// We treat delays in tasks differently depending on the amount of delay we
+// encounter. Suppose we posted a task with a target=16.667:
 //   Case 1: late but not unrecoverably-so
-//      now=18 tickTarget=16.667
+//      now=18 tick_target=16.667
 //
 //   Case 2: so late we obviously missed the tick
-//      now=25.0 tickTarget=16.667
+//      now=25.0 tick_target=16.667
 //
-// We treat the first case as a tick anyway, and assume the delay was
-// unusual. Thus, we compute the newTarget based on the old timebase:
-//      now=18   tickTarget=16.667  newTarget=33.333   --> tick(), postDelayedTask(floor(33.333-18)) --> postDelayedTask(15)
-// This brings us back to 18+15 = 33, which was where we would have been if the task hadn't been late.
+// We treat the first case as a tick anyway, and assume the delay was unusual.
+// Thus, we compute the newTarget based on the old timebase:
+//      now=18   tick_target=16.667  newTarget=33.333   -->
+//          tick(), postDelayedTask(floor(33.333-18)) --> postDelayedTask(15)
+// This brings us back to 18+15 = 33, which was where we would have been if the
+// task hadn't been late.
 //
-// For the really late delay, we we move to the next logical tick. The timebase is not reset.
-//      now=37   tickTarget=16.667  newTarget=50.000  --> tick(), postDelayedTask(floor(50.000-37)) --> postDelayedTask(13)
-base::TimeTicks DelayBasedTimeSource::nextTickTarget(base::TimeTicks now)
-{
-    base::TimeDelta newInterval = m_nextParameters.interval;
-    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;
-    DCHECK(newTickTarget > now);
-
-    // Avoid double ticks when:
-    // 1) Turning off the timer and turning it right back on.
-    // 2) Jittery data is passed to setTimebaseAndInterval().
-    if (newTickTarget - m_lastTickTime <= newInterval / static_cast<int>(1.0 / doubleTickThreshold))
-        newTickTarget += newInterval;
-
-    return newTickTarget;
+// For the really late delay, we we move to the next logical tick. The timebase
+// is not reset.
+//      now=37   tick_target=16.667  newTarget=50.000  -->
+//          tick(), postDelayedTask(floor(50.000-37)) --> postDelayedTask(13)
+base::TimeTicks DelayBasedTimeSource::NextTickTarget(base::TimeTicks now) {
+  base::TimeDelta new_interval = next_parameters_.interval;
+  int intervals_elapsed =
+      static_cast<int>(floor((now - next_parameters_.tick_target).InSecondsF() /
+                             new_interval.InSecondsF()));
+  base::TimeTicks last_effective_tick =
+      next_parameters_.tick_target + new_interval * intervals_elapsed;
+  base::TimeTicks new_tick_target = last_effective_tick + new_interval;
+  DCHECK(new_tick_target > now);
+
+  // Avoid double ticks when:
+  // 1) Turning off the timer and turning it right back on.
+  // 2) Jittery data is passed to SetTimebaseAndInterval().
+  if (new_tick_target - last_tick_time_ <=
+      new_interval / static_cast<int>(1.0 / kDoubleTickThreshold))
+    new_tick_target += new_interval;
+
+  return new_tick_target;
 }
 
-void DelayBasedTimeSource::postNextTickTask(base::TimeTicks now)
-{
-    base::TimeTicks newTickTarget = nextTickTarget(now);
+void DelayBasedTimeSource::PostNextTickTask(base::TimeTicks now) {
+  base::TimeTicks new_tick_target = NextTickTarget(now);
 
-    // Post another task *before* the tick and update state
-    base::TimeDelta delay = newTickTarget - now;
-    DCHECK(delay.InMillisecondsF() <=
-           m_nextParameters.interval.InMillisecondsF() * (1.0 + doubleTickThreshold));
-    m_thread->PostDelayedTask(base::Bind(&DelayBasedTimeSource::onTimerFired,
-                                         m_weakFactory.GetWeakPtr()),
-                              delay);
+  // Post another task *before* the tick and update state
+  base::TimeDelta delay = new_tick_target - now;
+  DCHECK(delay.InMillisecondsF() <=
+         next_parameters_.interval.InMillisecondsF() *
+         (1.0 + kDoubleTickThreshold));
+  thread_->PostDelayedTask(base::Bind(&DelayBasedTimeSource::OnTimerFired,
+                                      weak_factory_.GetWeakPtr()),
+                           delay);
 
-    m_nextParameters.tickTarget = newTickTarget;
-    m_currentParameters = m_nextParameters;
+  next_parameters_.tick_target = new_tick_target;
+  current_parameters_ = next_parameters_;
 }
 
 }  // namespace cc