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_ANIMATION_EVENTS_H_ | 5 #ifndef CC_ANIMATION_ANIMATION_EVENTS_H_ |
6 #define CC_ANIMATION_ANIMATION_EVENTS_H_ | 6 #define CC_ANIMATION_ANIMATION_EVENTS_H_ |
7 | 7 |
| 8 #include <memory> |
8 #include <vector> | 9 #include <vector> |
9 | 10 |
10 #include "base/memory/scoped_ptr.h" | |
11 #include "cc/animation/animation.h" | 11 #include "cc/animation/animation.h" |
12 #include "cc/animation/animation_curve.h" | 12 #include "cc/animation/animation_curve.h" |
13 #include "cc/base/cc_export.h" | 13 #include "cc/base/cc_export.h" |
14 #include "cc/output/filter_operations.h" | 14 #include "cc/output/filter_operations.h" |
15 #include "ui/gfx/transform.h" | 15 #include "ui/gfx/transform.h" |
16 | 16 |
17 namespace cc { | 17 namespace cc { |
18 | 18 |
19 struct CC_EXPORT AnimationEvent { | 19 struct CC_EXPORT AnimationEvent { |
20 enum Type { STARTED, FINISHED, ABORTED, PROPERTY_UPDATE, TAKEOVER }; | 20 enum Type { STARTED, FINISHED, ABORTED, PROPERTY_UPDATE, TAKEOVER }; |
(...skipping 14 matching lines...) Expand all Loading... |
35 int group_id; | 35 int group_id; |
36 TargetProperty::Type target_property; | 36 TargetProperty::Type target_property; |
37 base::TimeTicks monotonic_time; | 37 base::TimeTicks monotonic_time; |
38 bool is_impl_only; | 38 bool is_impl_only; |
39 float opacity; | 39 float opacity; |
40 gfx::Transform transform; | 40 gfx::Transform transform; |
41 FilterOperations filters; | 41 FilterOperations filters; |
42 | 42 |
43 // For continuing a scroll offset animation on the main thread. | 43 // For continuing a scroll offset animation on the main thread. |
44 double animation_start_time; | 44 double animation_start_time; |
45 scoped_ptr<AnimationCurve> curve; | 45 std::unique_ptr<AnimationCurve> curve; |
46 }; | 46 }; |
47 | 47 |
48 class CC_EXPORT AnimationEvents { | 48 class CC_EXPORT AnimationEvents { |
49 public: | 49 public: |
50 AnimationEvents(); | 50 AnimationEvents(); |
51 ~AnimationEvents(); | 51 ~AnimationEvents(); |
52 | 52 |
53 std::vector<AnimationEvent> events_; | 53 std::vector<AnimationEvent> events_; |
54 }; | 54 }; |
55 | 55 |
56 } // namespace cc | 56 } // namespace cc |
57 | 57 |
58 #endif // CC_ANIMATION_ANIMATION_EVENTS_H_ | 58 #endif // CC_ANIMATION_ANIMATION_EVENTS_H_ |
OLD | NEW |