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

Side by Side Diff: cc/CCActiveAnimationTest.cpp

Issue 11035010: cc: Change gtest includes to the style used in chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: testSuite -> test_suite Created 8 years, 2 months 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 | « no previous file | cc/CCDamageTrackerTest.cpp » ('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 "config.h" 5 #include "config.h"
6 6
7 #include "CCActiveAnimation.h" 7 #include "CCActiveAnimation.h"
8 8
9 #include "CCAnimationTestCommon.h" 9 #include "CCAnimationTestCommon.h"
10 #include <gmock/gmock.h> 10 #include "testing/gmock/include/gmock/gmock.h"
11 #include <gtest/gtest.h> 11 #include "testing/gtest/include/gtest/gtest.h"
12 #include <wtf/Vector.h> 12 #include <wtf/Vector.h>
13 13
14 using namespace WebKitTests; 14 using namespace WebKitTests;
15 using namespace cc; 15 using namespace cc;
16 16
17 namespace { 17 namespace {
18 18
19 PassOwnPtr<CCActiveAnimation> createActiveAnimation(int iterations, double durat ion) 19 PassOwnPtr<CCActiveAnimation> createActiveAnimation(int iterations, double durat ion)
20 { 20 {
21 OwnPtr<CCActiveAnimation> toReturn(CCActiveAnimation::create(adoptPtr(new Fa keFloatAnimationCurve(duration)), 0, 1, CCActiveAnimation::Opacity)); 21 OwnPtr<CCActiveAnimation> toReturn(CCActiveAnimation::create(adoptPtr(new Fa keFloatAnimationCurve(duration)), 0, 1, CCActiveAnimation::Opacity));
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 anim->suspend(0); 213 anim->suspend(0);
214 EXPECT_EQ(CCActiveAnimation::Paused, anim->runState()); 214 EXPECT_EQ(CCActiveAnimation::Paused, anim->runState());
215 anim->setRunState(CCActiveAnimation::Running, 0); 215 anim->setRunState(CCActiveAnimation::Running, 0);
216 EXPECT_EQ(CCActiveAnimation::Paused, anim->runState()); 216 EXPECT_EQ(CCActiveAnimation::Paused, anim->runState());
217 anim->resume(0); 217 anim->resume(0);
218 anim->setRunState(CCActiveAnimation::Running, 0); 218 anim->setRunState(CCActiveAnimation::Running, 0);
219 EXPECT_EQ(CCActiveAnimation::Running, anim->runState()); 219 EXPECT_EQ(CCActiveAnimation::Running, anim->runState());
220 } 220 }
221 221
222 } // namespace 222 } // namespace
OLDNEW
« no previous file with comments | « no previous file | cc/CCDamageTrackerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698