| 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_H_ | 5 #ifndef CC_ANIMATION_ANIMATION_H_ |
| 6 #define CC_ANIMATION_H_ | 6 #define CC_ANIMATION_ANIMATION_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "cc/base/cc_export.h" | 10 #include "cc/base/cc_export.h" |
| 11 | 11 |
| 12 namespace cc { | 12 namespace cc { |
| 13 | 13 |
| 14 class AnimationCurve; | 14 class AnimationCurve; |
| 15 | 15 |
| 16 // An Animation, contains all the state required to play an AnimationCurve. | 16 // An Animation, contains all the state required to play an AnimationCurve. |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 // we will refer to it as the 'controlling instance'. | 180 // we will refer to it as the 'controlling instance'. |
| 181 bool is_controlling_instance_; | 181 bool is_controlling_instance_; |
| 182 | 182 |
| 183 bool is_impl_only_; | 183 bool is_impl_only_; |
| 184 | 184 |
| 185 DISALLOW_COPY_AND_ASSIGN(Animation); | 185 DISALLOW_COPY_AND_ASSIGN(Animation); |
| 186 }; | 186 }; |
| 187 | 187 |
| 188 } // namespace cc | 188 } // namespace cc |
| 189 | 189 |
| 190 #endif // CC_ANIMATION_H_ | 190 #endif // CC_ANIMATION_ANIMATION_H_ |
| OLD | NEW |