| Index: ui/gfx/animation/multi_animation.h
|
| diff --git a/ui/gfx/animation/multi_animation.h b/ui/gfx/animation/multi_animation.h
|
| index fd28e3864930c4a96fc3f55b283d72e3bf209d94..a74656989ea786206936ed3bbc7dd300a8e83e4c 100644
|
| --- a/ui/gfx/animation/multi_animation.h
|
| +++ b/ui/gfx/animation/multi_animation.h
|
| @@ -33,11 +33,12 @@ class GFX_EXPORT MultiAnimation : public Animation {
|
| // for 200ms with a % between .25 and .75 use the following three values: 200,
|
| // 100, 400.
|
| struct Part {
|
| - Part() : time_ms(0), start_time_ms(0), end_time_ms(0), type(Tween::ZERO) {}
|
| - Part(int time_ms, Tween::Type type)
|
| + Part() : Part(0, Tween::ZERO) {}
|
| + Part(int time_ms, Tween::Type type) : Part(time_ms, 0, time_ms, type) {}
|
| + Part(int time_ms, int start_time_ms, int end_time_ms, Tween::Type type)
|
| : time_ms(time_ms),
|
| - start_time_ms(0),
|
| - end_time_ms(time_ms),
|
| + start_time_ms(start_time_ms),
|
| + end_time_ms(end_time_ms),
|
| type(type) {}
|
|
|
| int time_ms;
|
|
|