| Index: ui/base/animation/multi_animation.cc
|
| diff --git a/ui/base/animation/multi_animation.cc b/ui/base/animation/multi_animation.cc
|
| index 5a0c1e1919d4174ad6368bf1b7369fec0edee6d6..2e9e4772db634bde00d53ae24abec7130ef16acc 100644
|
| --- a/ui/base/animation/multi_animation.cc
|
| +++ b/ui/base/animation/multi_animation.cc
|
| @@ -10,7 +10,7 @@
|
| namespace ui {
|
|
|
| // Default interval, in ms.
|
| -static const int kDefaultInterval = 20;
|
| +static const int kDefaultTimerInterval = 20;
|
|
|
| static int TotalTime(const MultiAnimation::Parts& parts) {
|
| int time_ms = 0;
|
| @@ -21,8 +21,9 @@ static int TotalTime(const MultiAnimation::Parts& parts) {
|
| return time_ms;
|
| }
|
|
|
| -MultiAnimation::MultiAnimation(const Parts& parts)
|
| - : Animation(base::TimeDelta::FromMilliseconds(kDefaultInterval)),
|
| +MultiAnimation::MultiAnimation(const Parts& parts,
|
| + base::TimeDelta timer_interval)
|
| + : Animation(timer_interval),
|
| parts_(parts),
|
| cycle_time_ms_(TotalTime(parts)),
|
| current_value_(0),
|
| @@ -33,6 +34,11 @@ MultiAnimation::MultiAnimation(const Parts& parts)
|
|
|
| MultiAnimation::~MultiAnimation() {}
|
|
|
| +// static.
|
| +base::TimeDelta MultiAnimation::GetDefaultTimerInterval() {
|
| + return base::TimeDelta::FromMilliseconds(kDefaultTimerInterval);
|
| +}
|
| +
|
| double MultiAnimation::GetCurrentValue() const {
|
| return current_value_;
|
| }
|
|
|