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

Unified Diff: cc/layer_unittest.cc

Issue 12517003: cc: Chromify the Animation and LayerAnimationController classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layer_tree_host_unittest_context.cc ('k') | cc/test/animation_test_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_unittest.cc
diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc
index c3c20136cbfd85ef365d90995719de9657b96752..2b1e418c4862f900c4a2fbfe984d2df81c766ccd 100644
--- a/cc/layer_unittest.cc
+++ b/cc/layer_unittest.cc
@@ -882,12 +882,12 @@ TEST(LayerLayerTreeHostTest, destroyHostWithNonNullRootLayer)
static bool addTestAnimation(Layer* layer)
{
- scoped_ptr<KeyframedFloatAnimationCurve> curve(KeyframedFloatAnimationCurve::create());
- curve->addKeyframe(FloatKeyframe::create(0, 0.3f, scoped_ptr<TimingFunction>()));
- curve->addKeyframe(FloatKeyframe::create(1, 0.7f, scoped_ptr<TimingFunction>()));
- scoped_ptr<Animation> animation(Animation::create(curve.PassAs<AnimationCurve>(), 0, 0, Animation::Opacity));
+ scoped_ptr<KeyframedFloatAnimationCurve> curve(KeyframedFloatAnimationCurve::Create());
+ curve->AddKeyframe(FloatKeyframe::Create(0.0, 0.3f, scoped_ptr<TimingFunction>()));
+ curve->AddKeyframe(FloatKeyframe::Create(1.0, 0.7f, scoped_ptr<TimingFunction>()));
+ scoped_ptr<Animation> animation(Animation::Create(curve.PassAs<AnimationCurve>(), 0, 0, Animation::Opacity));
- return layer->addAnimation(animation.Pass());
+ return layer->AddAnimation(animation.Pass());
}
TEST(LayerLayerTreeHostTest, shouldNotAddAnimationWithoutAnimationRegistrar)
@@ -899,7 +899,7 @@ TEST(LayerLayerTreeHostTest, shouldNotAddAnimationWithoutAnimationRegistrar)
EXPECT_FALSE(addTestAnimation(layer.get()));
scoped_ptr<AnimationRegistrar> registrar = AnimationRegistrar::create();
- layer->layerAnimationController()->setAnimationRegistrar(registrar.get());
+ layer->layerAnimationController()->SetAnimationRegistrar(registrar.get());
// Case 2: with an AnimationRegistrar, the animation should be accepted.
EXPECT_TRUE(addTestAnimation(layer.get()));
« no previous file with comments | « cc/layer_tree_host_unittest_context.cc ('k') | cc/test/animation_test_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698