Index: cc/animation_events.h |
diff --git a/cc/animation_events.h b/cc/animation_events.h |
index 41e82e5107c9a9e0a20b1630050ef866a45da46e..de1aa886962542fe324fe2b28d4fc3bb6c2ca888 100644 |
--- a/cc/animation_events.h |
+++ b/cc/animation_events.h |
@@ -13,25 +13,27 @@ |
namespace cc { |
struct AnimationEvent { |
- enum Type { Started, Finished, PropertyUpdate }; |
- |
- AnimationEvent(Type type, int layerId, int groupId, Animation::TargetProperty targetProperty, double monotonicTime) |
- : type(type) |
- , layerId(layerId) |
- , groupId(groupId) |
- , targetProperty(targetProperty) |
- , monotonicTime(monotonicTime) |
- , opacity(0) |
- { |
- } |
- |
- Type type; |
- int layerId; |
- int groupId; |
- Animation::TargetProperty targetProperty; |
- double monotonicTime; |
- float opacity; |
- gfx::Transform transform; |
+ enum Type { Started, Finished, PropertyUpdate }; |
+ |
+ AnimationEvent(Type type, |
+ int layer_id, |
+ int group_id, |
+ Animation::TargetProperty target_property, |
+ double monotonic_time) |
+ : type(type), |
+ layer_id(layer_id), |
+ group_id(group_id), |
+ target_property(target_property), |
+ monotonic_time(monotonic_time), |
+ opacity(0.f) {} |
+ |
+ Type type; |
+ int layer_id; |
+ int group_id; |
+ Animation::TargetProperty target_property; |
+ double monotonic_time; |
+ float opacity; |
+ gfx::Transform transform; |
}; |
typedef std::vector<AnimationEvent> AnimationEventsVector; |