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 #include "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "cc/active_animation.h" | 7 #include "cc/active_animation.h" |
8 | 8 |
9 #include "cc/test/animation_test_common.h" | 9 #include "cc/test/animation_test_common.h" |
10 #include "testing/gmock/include/gmock/gmock.h" | 10 #include "testing/gmock/include/gmock/gmock.h" |
11 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
12 | 12 |
13 using namespace WebKitTests; | 13 using namespace WebKitTests; |
14 using namespace cc; | |
15 | 14 |
15 namespace cc { | |
16 namespace { | 16 namespace { |
danakj
2012/11/10 01:15:43
That looks like a script mistake? That's not how u
tfarina
2012/11/10 01:18:45
What is the problem? :)
Is perfectly fine to have
jamesr
2012/11/10 01:20:12
ui/gfx/point_unittest.cc seems similar, except for
| |
17 | 17 |
18 scoped_ptr<ActiveAnimation> createActiveAnimation(int iterations, double duratio n) | 18 scoped_ptr<ActiveAnimation> createActiveAnimation(int iterations, double duratio n) |
19 { | 19 { |
20 scoped_ptr<ActiveAnimation> toReturn(ActiveAnimation::create(make_scoped_ptr (new FakeFloatAnimationCurve(duration)).PassAs<AnimationCurve>(), 0, 1, ActiveAn imation::Opacity)); | 20 scoped_ptr<ActiveAnimation> toReturn(ActiveAnimation::create(make_scoped_ptr (new FakeFloatAnimationCurve(duration)).PassAs<AnimationCurve>(), 0, 1, ActiveAn imation::Opacity)); |
21 toReturn->setIterations(iterations); | 21 toReturn->setIterations(iterations); |
22 return toReturn.Pass(); | 22 return toReturn.Pass(); |
23 } | 23 } |
24 | 24 |
25 scoped_ptr<ActiveAnimation> createActiveAnimation(int iterations) | 25 scoped_ptr<ActiveAnimation> createActiveAnimation(int iterations) |
26 { | 26 { |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
211 scoped_ptr<ActiveAnimation> anim(createActiveAnimation(1)); | 211 scoped_ptr<ActiveAnimation> anim(createActiveAnimation(1)); |
212 anim->suspend(0); | 212 anim->suspend(0); |
213 EXPECT_EQ(ActiveAnimation::Paused, anim->runState()); | 213 EXPECT_EQ(ActiveAnimation::Paused, anim->runState()); |
214 anim->setRunState(ActiveAnimation::Running, 0); | 214 anim->setRunState(ActiveAnimation::Running, 0); |
215 EXPECT_EQ(ActiveAnimation::Paused, anim->runState()); | 215 EXPECT_EQ(ActiveAnimation::Paused, anim->runState()); |
216 anim->resume(0); | 216 anim->resume(0); |
217 anim->setRunState(ActiveAnimation::Running, 0); | 217 anim->setRunState(ActiveAnimation::Running, 0); |
218 EXPECT_EQ(ActiveAnimation::Running, anim->runState()); | 218 EXPECT_EQ(ActiveAnimation::Running, anim->runState()); |
219 } | 219 } |
220 | 220 |
221 } // anonymous namespace | 221 } // namespace |
222 } // namespace cc | |
OLD | NEW |