| 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 #include "cc/animation/element_animations.h" | 5 #include "cc/animation/element_animations.h" |
| 6 | 6 |
| 7 #include "cc/animation/animation_delegate.h" | 7 #include "cc/animation/animation_delegate.h" |
| 8 #include "cc/animation/animation_host.h" | 8 #include "cc/animation/animation_host.h" |
| 9 #include "cc/animation/animation_id_provider.h" | 9 #include "cc/animation/animation_id_provider.h" |
| 10 #include "cc/animation/animation_player.h" | 10 #include "cc/animation/animation_player.h" |
| 11 #include "cc/animation/animation_registrar.h" | |
| 12 #include "cc/animation/animation_timeline.h" | 11 #include "cc/animation/animation_timeline.h" |
| 13 #include "cc/test/animation_test_common.h" | 12 #include "cc/test/animation_test_common.h" |
| 14 #include "cc/test/animation_timelines_test_common.h" | 13 #include "cc/test/animation_timelines_test_common.h" |
| 15 | 14 |
| 16 namespace cc { | 15 namespace cc { |
| 17 namespace { | 16 namespace { |
| 18 | 17 |
| 19 class ElementAnimationsTest : public AnimationTimelinesTest { | 18 class ElementAnimationsTest : public AnimationTimelinesTest { |
| 20 public: | 19 public: |
| 21 ElementAnimationsTest() {} | 20 ElementAnimationsTest() {} |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 node = node->next()) { | 208 node = node->next()) { |
| 210 const AnimationPlayer* player_impl = node->value(); | 209 const AnimationPlayer* player_impl = node->value(); |
| 211 EXPECT_TRUE(timeline_->GetPlayerById(player_impl->id())); | 210 EXPECT_TRUE(timeline_->GetPlayerById(player_impl->id())); |
| 212 ++list_size_after; | 211 ++list_size_after; |
| 213 } | 212 } |
| 214 EXPECT_EQ(2, list_size_after); | 213 EXPECT_EQ(2, list_size_after); |
| 215 } | 214 } |
| 216 | 215 |
| 217 } // namespace | 216 } // namespace |
| 218 } // namespace cc | 217 } // namespace cc |
| OLD | NEW |