| Index: cc/animation_events.h
|
| diff --git a/cc/animation_events.h b/cc/animation_events.h
|
| index 5e86ef7381527b32b9017de03a9fc4935c3dd113..52c99d3539ef66df4a34b51160a3573cf29fbded 100644
|
| --- a/cc/animation_events.h
|
| +++ b/cc/animation_events.h
|
| @@ -11,10 +11,10 @@
|
|
|
| namespace cc {
|
|
|
| -struct CCAnimationEvent {
|
| +struct AnimationEvent {
|
| enum Type { Started, Finished };
|
|
|
| - CCAnimationEvent(Type type, int layerId, int groupId, CCActiveAnimation::TargetProperty targetProperty, double monotonicTime)
|
| + AnimationEvent(Type type, int layerId, int groupId, ActiveAnimation::TargetProperty targetProperty, double monotonicTime)
|
| : type(type)
|
| , layerId(layerId)
|
| , groupId(groupId)
|
| @@ -26,11 +26,11 @@ struct CCAnimationEvent {
|
| Type type;
|
| int layerId;
|
| int groupId;
|
| - CCActiveAnimation::TargetProperty targetProperty;
|
| + ActiveAnimation::TargetProperty targetProperty;
|
| double monotonicTime;
|
| };
|
|
|
| -typedef std::vector<CCAnimationEvent> CCAnimationEventsVector;
|
| +typedef std::vector<AnimationEvent> AnimationEventsVector;
|
|
|
| } // namespace cc
|
|
|
|
|