| Index: cc/LayerChromiumTest.cpp
|
| diff --git a/cc/LayerChromiumTest.cpp b/cc/LayerChromiumTest.cpp
|
| index 867e4db724f9dd4921d11c536af6acb329c9ebba..b1ca80e875209281d0984d8898e06a56f8525e0f 100644
|
| --- a/cc/LayerChromiumTest.cpp
|
| +++ b/cc/LayerChromiumTest.cpp
|
| @@ -791,12 +791,12 @@ TEST(LayerChromiumLayerTreeHostTest, destroyHostWithNonNullRootLayer)
|
|
|
| static bool addTestAnimation(LayerChromium* layer)
|
| {
|
| - OwnPtr<CCKeyframedFloatAnimationCurve> curve(CCKeyframedFloatAnimationCurve::create());
|
| - curve->addKeyframe(CCFloatKeyframe::create(0, 0.3f, nullptr));
|
| - curve->addKeyframe(CCFloatKeyframe::create(1, 0.7f, nullptr));
|
| - OwnPtr<CCActiveAnimation> animation(CCActiveAnimation::create(curve.release(), 0, 0, CCActiveAnimation::Opacity));
|
| + scoped_ptr<CCKeyframedFloatAnimationCurve> curve(CCKeyframedFloatAnimationCurve::create());
|
| + curve->addKeyframe(CCFloatKeyframe::create(0, 0.3f, scoped_ptr<CCTimingFunction>()));
|
| + curve->addKeyframe(CCFloatKeyframe::create(1, 0.7f, scoped_ptr<CCTimingFunction>()));
|
| + scoped_ptr<CCActiveAnimation> animation(CCActiveAnimation::create(curve.PassAs<CCAnimationCurve>(), 0, 0, CCActiveAnimation::Opacity));
|
|
|
| - return layer->addAnimation(animation.release());
|
| + return layer->addAnimation(animation.Pass());
|
| }
|
|
|
| TEST(LayerChromiumLayerTreeHostTest, shouldNotAddAnimationWithoutLayerTreeHost)
|
|
|