Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: cc/active_animation_unittest.cc

Issue 11348371: cc: Move WebCompositorOutputSurface and related classes into cc/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: forlanding6 Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/DEPS ('k') | cc/cc.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "cc/active_animation.h" 5 #include "cc/active_animation.h"
6 6
7 #include "cc/test/animation_test_common.h" 7 #include "cc/test/animation_test_common.h"
8 #include "testing/gmock/include/gmock/gmock.h" 8 #include "testing/gmock/include/gmock/gmock.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
11 using namespace WebKitTests;
12
13 namespace cc { 11 namespace cc {
14 namespace { 12 namespace {
15 13
16 scoped_ptr<ActiveAnimation> createActiveAnimation(int iterations, double duratio n) 14 scoped_ptr<ActiveAnimation> createActiveAnimation(int iterations, double duratio n)
17 { 15 {
18 scoped_ptr<ActiveAnimation> toReturn(ActiveAnimation::create(make_scoped_ptr (new FakeFloatAnimationCurve(duration)).PassAs<AnimationCurve>(), 0, 1, ActiveAn imation::Opacity)); 16 scoped_ptr<ActiveAnimation> toReturn(ActiveAnimation::create(make_scoped_ptr (new FakeFloatAnimationCurve(duration)).PassAs<AnimationCurve>(), 0, 1, ActiveAn imation::Opacity));
19 toReturn->setIterations(iterations); 17 toReturn->setIterations(iterations);
20 return toReturn.Pass(); 18 return toReturn.Pass();
21 } 19 }
22 20
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 EXPECT_EQ(ActiveAnimation::Paused, anim->runState()); 209 EXPECT_EQ(ActiveAnimation::Paused, anim->runState());
212 anim->setRunState(ActiveAnimation::Running, 0); 210 anim->setRunState(ActiveAnimation::Running, 0);
213 EXPECT_EQ(ActiveAnimation::Paused, anim->runState()); 211 EXPECT_EQ(ActiveAnimation::Paused, anim->runState());
214 anim->resume(0); 212 anim->resume(0);
215 anim->setRunState(ActiveAnimation::Running, 0); 213 anim->setRunState(ActiveAnimation::Running, 0);
216 EXPECT_EQ(ActiveAnimation::Running, anim->runState()); 214 EXPECT_EQ(ActiveAnimation::Running, anim->runState());
217 } 215 }
218 216
219 } // namespace 217 } // namespace
220 } // namespace cc 218 } // namespace cc
OLDNEW
« no previous file with comments | « cc/DEPS ('k') | cc/cc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698