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

Side by Side Diff: cc/animation/animation_unittest.cc

Issue 608503005: Revert of cc: Remove use of PassAs() and constructor-casting with scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « cc/PRESUBMIT.py ('k') | cc/animation/keyframed_animation_curve.cc » ('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/animation/animation.h" 5 #include "cc/animation/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 namespace cc { 11 namespace cc {
12 namespace { 12 namespace {
13 13
14 using base::TimeDelta; 14 using base::TimeDelta;
15 15
16 static base::TimeTicks TicksFromSecondsF(double seconds) { 16 static base::TimeTicks TicksFromSecondsF(double seconds) {
17 return base::TimeTicks::FromInternalValue(seconds * 17 return base::TimeTicks::FromInternalValue(seconds *
18 base::Time::kMicrosecondsPerSecond); 18 base::Time::kMicrosecondsPerSecond);
19 } 19 }
20 20
21 scoped_ptr<Animation> CreateAnimation(double iterations, 21 scoped_ptr<Animation> CreateAnimation(double iterations,
22 double duration, 22 double duration,
23 double playback_rate) { 23 double playback_rate) {
24 scoped_ptr<Animation> to_return( 24 scoped_ptr<Animation> to_return(Animation::Create(
25 Animation::Create(make_scoped_ptr(new FakeFloatAnimationCurve(duration)), 25 make_scoped_ptr(
26 0, 26 new FakeFloatAnimationCurve(duration)).PassAs<AnimationCurve>(),
27 1, 27 0,
28 Animation::Opacity)); 28 1,
29 Animation::Opacity));
29 to_return->set_iterations(iterations); 30 to_return->set_iterations(iterations);
30 to_return->set_playback_rate(playback_rate); 31 to_return->set_playback_rate(playback_rate);
31 return to_return.Pass(); 32 return to_return.Pass();
32 } 33 }
33 34
34 scoped_ptr<Animation> CreateAnimation(double iterations, double duration) { 35 scoped_ptr<Animation> CreateAnimation(double iterations, double duration) {
35 return CreateAnimation(iterations, duration, 1); 36 return CreateAnimation(iterations, duration, 1);
36 } 37 }
37 38
38 scoped_ptr<Animation> CreateAnimation(double iterations) { 39 scoped_ptr<Animation> CreateAnimation(double iterations) {
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(1.0))); 707 EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(1.0)));
707 708
708 anim->set_fill_mode(Animation::FillModeBoth); 709 anim->set_fill_mode(Animation::FillModeBoth);
709 EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(-1.0))); 710 EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(-1.0)));
710 EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(0.0))); 711 EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(0.0)));
711 EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(1.0))); 712 EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(1.0)));
712 } 713 }
713 714
714 } // namespace 715 } // namespace
715 } // namespace cc 716 } // namespace cc
OLDNEW
« no previous file with comments | « cc/PRESUBMIT.py ('k') | cc/animation/keyframed_animation_curve.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698