| 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_EVENTS_H_ |
| 6 #define CC_ANIMATION_EVENTS_H_ | 6 #define CC_ANIMATION_EVENTS_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "cc/animation.h" | 10 #include "cc/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, int layerId, int groupId, Animation::TargetPropert
y targetProperty, double monotonicTime) | 18 AnimationEvent(Type type, |
| 19 : type(type) | 19 int layer_id, |
| 20 , layerId(layerId) | 20 int group_id, |
| 21 , groupId(groupId) | 21 Animation::TargetProperty target_property, |
| 22 , targetProperty(targetProperty) | 22 double monotonic_time) |
| 23 , monotonicTime(monotonicTime) | 23 : type(type), |
| 24 , opacity(0) | 24 layer_id(layer_id), |
| 25 { | 25 group_id(group_id), |
| 26 } | 26 target_property(target_property), |
| 27 monotonic_time(monotonic_time), |
| 28 opacity(0.f) {} |
| 27 | 29 |
| 28 Type type; | 30 Type type; |
| 29 int layerId; | 31 int layer_id; |
| 30 int groupId; | 32 int group_id; |
| 31 Animation::TargetProperty targetProperty; | 33 Animation::TargetProperty target_property; |
| 32 double monotonicTime; | 34 double monotonic_time; |
| 33 float opacity; | 35 float opacity; |
| 34 gfx::Transform transform; | 36 gfx::Transform transform; |
| 35 }; | 37 }; |
| 36 | 38 |
| 37 typedef std::vector<AnimationEvent> AnimationEventsVector; | 39 typedef std::vector<AnimationEvent> AnimationEventsVector; |
| 38 | 40 |
| 39 } // namespace cc | 41 } // namespace cc |
| 40 | 42 |
| 41 #endif // CC_ANIMATION_EVENTS_H_ | 43 #endif // CC_ANIMATION_EVENTS_H_ |
| OLD | NEW |