| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ | 5 #ifndef CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ |
| 6 #define CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ | 6 #define CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <unordered_map> | 9 #include <unordered_map> |
| 10 | 10 |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 int NextTestLayerId(); | 226 int NextTestLayerId(); |
| 227 | 227 |
| 228 TestHostClient client_; | 228 TestHostClient client_; |
| 229 TestHostClient client_impl_; | 229 TestHostClient client_impl_; |
| 230 | 230 |
| 231 AnimationHost* host_; | 231 AnimationHost* host_; |
| 232 AnimationHost* host_impl_; | 232 AnimationHost* host_impl_; |
| 233 | 233 |
| 234 const int timeline_id_; | 234 const int timeline_id_; |
| 235 const int player_id_; | 235 const int player_id_; |
| 236 int layer_id_; | 236 int element_id_; |
| 237 | 237 |
| 238 int next_test_layer_id_; | 238 int next_test_layer_id_; |
| 239 | 239 |
| 240 scoped_refptr<AnimationTimeline> timeline_; | 240 scoped_refptr<AnimationTimeline> timeline_; |
| 241 scoped_refptr<AnimationPlayer> player_; | 241 scoped_refptr<AnimationPlayer> player_; |
| 242 | 242 |
| 243 scoped_refptr<AnimationTimeline> timeline_impl_; | 243 scoped_refptr<AnimationTimeline> timeline_impl_; |
| 244 scoped_refptr<AnimationPlayer> player_impl_; | 244 scoped_refptr<AnimationPlayer> player_impl_; |
| 245 }; | 245 }; |
| 246 | 246 |
| 247 } // namespace cc | 247 } // namespace cc |
| 248 | 248 |
| 249 #endif // CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ | 249 #endif // CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ |
| OLD | NEW |