| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CC_ANIMATION_EVENTS_H_ | 5 #ifndef CC_ANIMATION_ANIMATION_EVENTS_H_ |
| 6 #define CC_ANIMATION_EVENTS_H_ | 6 #define CC_ANIMATION_ANIMATION_EVENTS_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "cc/animation.h" | 10 #include "cc/animation/animation.h" |
| 11 #include "ui/gfx/transform.h" | 11 #include "ui/gfx/transform.h" |
| 12 | 12 |
| 13 namespace cc { | 13 namespace cc { |
| 14 | 14 |
| 15 struct AnimationEvent { | 15 struct AnimationEvent { |
| 16 enum Type { Started, Finished, PropertyUpdate }; | 16 enum Type { Started, Finished, PropertyUpdate }; |
| 17 | 17 |
| 18 AnimationEvent(Type type, | 18 AnimationEvent(Type type, |
| 19 int layer_id, | 19 int layer_id, |
| 20 int group_id, | 20 int group_id, |
| (...skipping 12 matching lines...) Expand all Loading... |
| 33 Animation::TargetProperty target_property; | 33 Animation::TargetProperty target_property; |
| 34 double monotonic_time; | 34 double monotonic_time; |
| 35 float opacity; | 35 float opacity; |
| 36 gfx::Transform transform; | 36 gfx::Transform transform; |
| 37 }; | 37 }; |
| 38 | 38 |
| 39 typedef std::vector<AnimationEvent> AnimationEventsVector; | 39 typedef std::vector<AnimationEvent> AnimationEventsVector; |
| 40 | 40 |
| 41 } // namespace cc | 41 } // namespace cc |
| 42 | 42 |
| 43 #endif // CC_ANIMATION_EVENTS_H_ | 43 #endif // CC_ANIMATION_ANIMATION_EVENTS_H_ |
| OLD | NEW |