Blink Compositor Animation: Make Animation and Curve methods non-virtual.

third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 
 #include "core/animation/CompositorAnimations.h"
 
 #include "core/animation/Animation.h"
 #include "core/animation/AnimationTimeline.h"
 #include "core/animation/CompositorAnimationsImpl.h"
-#include "core/animation/CompositorAnimationsTestHelper.h"
 #include "core/animation/CompositorPendingAnimations.h"
 #include "core/animation/ElementAnimations.h"
 #include "core/animation/KeyframeEffect.h"
 #include "core/animation/animatable/AnimatableDouble.h"
 #include "core/animation/animatable/AnimatableFilterOperations.h"
 #include "core/animation/animatable/AnimatableTransform.h"
 #include "core/animation/animatable/AnimatableValueTestHelper.h"
 #include "core/dom/Document.h"
 #include "core/layout/LayoutObject.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/animation/CompositorAnimation.h"
+#include "platform/animation/CompositorFloatAnimationCurve.h"
+#include "platform/animation/CompositorFloatKeyframe.h"
 #include "platform/geometry/FloatBox.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/graphics/filters/FilterOperations.h"
 #include "platform/transforms/TransformOperations.h"
 #include "platform/transforms/TranslateTransformOperation.h"
-#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/HashFunctions.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
-using ::testing::ExpectationSet;
-using ::testing::Ref;
-using ::testing::Return;
-using ::testing::_;
-
-class AnimationCompositorAnimationsTest : public AnimationCompositorAnimationsTestBase {
+class AnimationCompositorAnimationsTest : public ::testing::Test {
 protected:
     RefPtr<TimingFunction> m_linearTimingFunction;
     RefPtr<TimingFunction> m_cubicEaseTimingFunction;
     RefPtr<TimingFunction> m_cubicCustomTimingFunction;
     RefPtr<TimingFunction> m_stepTimingFunction;
 
     Timing m_timing;
     CompositorAnimationsImpl::CompositorTiming m_compositorTiming;
     OwnPtr<AnimatableValueKeyframeVector> m_keyframeVector2;
     Persistent<AnimatableValueKeyframeEffectModel> m_keyframeAnimationEffect2;
     OwnPtr<AnimatableValueKeyframeVector> m_keyframeVector5;
     Persistent<AnimatableValueKeyframeEffectModel> m_keyframeAnimationEffect5;
 
     Persistent<Document> m_document;
     Persistent<Element> m_element;
     Persistent<AnimationTimeline> m_timeline;
     OwnPtr<DummyPageHolder> m_pageHolder;
-    CompositorFactoryMock* m_mockCompositorFactory;
 
     void SetUp() override
     {
-        AnimationCompositorAnimationsTestBase::SetUp();
-
-        m_mockCompositorFactory = new CompositorFactoryMock();
-        CompositorFactory::initializeForTesting(adoptPtr(m_mockCompositorFactory));
-
         m_linearTimingFunction = LinearTimingFunction::shared();
         m_cubicEaseTimingFunction = CubicBezierTimingFunction::preset(CubicBezierTimingFunction::EaseType::EASE);
         m_cubicCustomTimingFunction = CubicBezierTimingFunction::create(1, 2, 3, 4);
         m_stepTimingFunction = StepsTimingFunction::create(1, StepsTimingFunction::StepPosition::END);
 
         m_timing = createCompositableTiming();
         m_compositorTiming = CompositorAnimationsImpl::CompositorTiming();
         // Make sure the CompositableTiming is really compositable, otherwise
         // most other tests will fail.
         ASSERT(convertTimingForCompositor(m_timing, m_compositorTiming));
 
         m_keyframeVector2 = createCompositableFloatKeyframeVector(2);
         m_keyframeAnimationEffect2 = AnimatableValueKeyframeEffectModel::create(*m_keyframeVector2);
 
         m_keyframeVector5 = createCompositableFloatKeyframeVector(5);
         m_keyframeAnimationEffect5 = AnimatableValueKeyframeEffectModel::create(*m_keyframeVector5);
 
-        EXPECT_CALL(*m_mockCompositorFactory, createAnimationTimeline())
-            .WillOnce(Return(new WebCompositorAnimationTimelineMock()));
-
         m_pageHolder = DummyPageHolder::create();
         m_document = &m_pageHolder->document();
         m_document->animationClock().resetTimeForTesting();
 
-        EXPECT_CALL(*m_mockCompositorFactory, createAnimationTimeline())
-            .WillOnce(Return(new WebCompositorAnimationTimelineMock()));
-
         m_timeline = AnimationTimeline::create(m_document.get());
         m_timeline->resetForTesting();
         m_element = m_document->createElement("test", ASSERT_NO_EXCEPTION);
     }
 
-    void TearDown() override
-    {
-        m_mockCompositorFactory = nullptr;
-        CompositorFactory::shutdown();
-    }
-
 public:
     bool convertTimingForCompositor(const Timing& t, CompositorAnimationsImpl::CompositorTiming& out)
     {
         return CompositorAnimationsImpl::convertTimingForCompositor(t, 0, out, 1);
     }
     bool isCandidateForAnimationOnCompositor(const Timing& timing, const EffectModel& effect)
     {
         return CompositorAnimations::instance()->isCandidateForAnimationOnCompositor(timing, *m_element.get(), nullptr, effect, 1);
     }
     void getAnimationOnCompositor(Timing& timing, AnimatableValueKeyframeEffectModel& effect, Vector<OwnPtr<CompositorAnimation>>& animations)
     {
-        return getAnimationOnCompositor(timing, effect, animations, 1);
+        getAnimationOnCompositor(timing, effect, animations, 1);
     }
     void getAnimationOnCompositor(Timing& timing, AnimatableValueKeyframeEffectModel& effect, Vector<OwnPtr<CompositorAnimation>>& animations, double playerPlaybackRate)
     {
-        return CompositorAnimationsImpl::getAnimationOnCompositor(timing, 0, std::numeric_limits<double>::quiet_NaN(), 0, effect, animations, playerPlaybackRate);
+        CompositorAnimationsImpl::getAnimationOnCompositor(timing, 0, std::numeric_limits<double>::quiet_NaN(), 0, effect, animations, playerPlaybackRate);
     }
     bool getAnimationBounds(FloatBox& boundingBox, const EffectModel& effect, double minValue, double maxValue)
     {
         return CompositorAnimations::instance()->getAnimatedBoundingBox(boundingBox, effect, minValue, maxValue);
     }
 
     bool duplicateSingleKeyframeAndTestIsCandidateOnResult(AnimatableValueKeyframe* frame)
     {
         EXPECT_EQ(frame->offset(), 0);
         AnimatableValueKeyframeVector frames;
@@ skipping 103 matching lines @@
         }
         return nullptr;
     }
 
     void simulateFrame(double time)
     {
         m_document->animationClock().updateTime(time);
         m_document->compositorPendingAnimations().update(false);
         m_timeline->serviceAnimations(TimingUpdateForAnimationFrame);
     }
+
+    PassOwnPtr<CompositorAnimation> convertToCompositorAnimation(AnimatableValueKeyframeEffectModel& effect, double playerPlaybackRate)
+    {
+        Vector<OwnPtr<CompositorAnimation>> result;
+        getAnimationOnCompositor(m_timing, effect, result, playerPlaybackRate);
+        DCHECK_EQ(1U, result.size());
+        return std::move(result[0]);
+    }
+
+    PassOwnPtr<CompositorAnimation> convertToCompositorAnimation(AnimatableValueKeyframeEffectModel& effect)
+    {
+        return convertToCompositorAnimation(effect, 1.0);
+    }
 };
 
 class LayoutObjectProxy : public LayoutObject {
 public:
     static LayoutObjectProxy* create(Node* node)
     {
         return new LayoutObjectProxy(node);
     }
 
     static void dispose(LayoutObjectProxy* proxy)
@@ skipping 366 matching lines @@
 
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
 
 TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimation)
 {
     // KeyframeEffect to convert
     AnimatableValueKeyframeEffectModel* effect = createKeyframeEffectModel(
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(2.0).get(), 0),
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(5.0).get(), 1.0));
-    // --
 
-    // Curve is created
-    WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;
-    ExpectationSet usesMockCurve;
-    EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())
-        .WillOnce(Return(mockCurvePtr));
+    OwnPtr<CompositorAnimation> animation = convertToCompositorAnimation(*effect);
+    EXPECT_EQ(CompositorTargetProperty::OPACITY, animation->targetProperty());
+    EXPECT_EQ(1.0, animation->iterations());
+    EXPECT_EQ(0, animation->timeOffset());
+    EXPECT_EQ(CompositorAnimation::Direction::NORMAL, animation->getDirection());
+    EXPECT_EQ(1.0, animation->playbackRate());
 
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addLinearKeyframe(CompositorFloatKeyframe(0.0, 2.0)));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addCubicBezierKeyframe(CompositorFloatKeyframe(1.0, 5.0), CubicBezierTimingFunction::EaseType::EASE));
+    OwnPtr<CompositorFloatAnimationCurve> keyframedFloatCurve = animation->floatCurveForTesting();
 
-    // Create animation
-    WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(CompositorTargetProperty::OPACITY);
-    ExpectationSet usesMockAnimation;
+    Vector<CompositorFloatKeyframe> keyframes = keyframedFloatCurve->keyframesForTesting();
+    ASSERT_EQ(2UL, keyframes.size());
 
-    usesMockCurve += EXPECT_CALL(*m_mockCompositorFactory, createAnimation(Ref(*mockCurvePtr), CompositorTargetProperty::OPACITY, _, _))
-        .WillOnce(Return(mockAnimationPtr));
+    EXPECT_EQ(0, keyframes[0].time);
+    EXPECT_EQ(2.0f, keyframes[0].value);
+    EXPECT_TRUE(keyframedFloatCurve->keyframeHasLinearTimingFunctionForTesting(0));
 
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(CompositorAnimation::Direction::NORMAL));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setPlaybackRate(1));
-
-    EXPECT_CALL(*mockAnimationPtr, delete_())
-        .Times(1)
-        .After(usesMockAnimation);
-    EXPECT_CALL(*mockCurvePtr, delete_())
-        .Times(1)
-        .After(usesMockCurve);
-
-    // Go!
-    Vector<OwnPtr<CompositorAnimation>> result;
-    getAnimationOnCompositor(m_timing, *effect, result);
-    EXPECT_EQ(1U, result.size());
-    result[0].reset();
+    EXPECT_EQ(1.0, keyframes[1].time);
+    EXPECT_EQ(5.0f, keyframes[1].value);
+    EXPECT_EQ(CubicBezierTimingFunction::EaseType::EASE, keyframedFloatCurve->getKeyframeEaseTypeForTesting(1));
 }
 
 TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationDuration)
 {
     // KeyframeEffect to convert
     AnimatableValueKeyframeEffectModel* effect = createKeyframeEffectModel(
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(2.0).get(), 0),
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(5.0).get(), 1.0));
 
-    m_timing.iterationDuration = 10.0;
-    // --
+    const double duration = 10.0;
+    m_timing.iterationDuration = duration;
 
-    // Curve is created
-    WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;
-    ExpectationSet usesMockCurve;
-    EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())
-        .WillOnce(Return(mockCurvePtr));
+    OwnPtr<CompositorAnimation> animation = convertToCompositorAnimation(*effect);
+    OwnPtr<CompositorFloatAnimationCurve> keyframedFloatCurve = animation->floatCurveForTesting();
 
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addLinearKeyframe(CompositorFloatKeyframe(0.0, 2.0)));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addCubicBezierKeyframe(CompositorFloatKeyframe(10.0, 5.0), CubicBezierTimingFunction::EaseType::EASE));
+    Vector<CompositorFloatKeyframe> keyframes = keyframedFloatCurve->keyframesForTesting();
+    ASSERT_EQ(2UL, keyframes.size());
 
-    // Create animation
-    WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(CompositorTargetProperty::OPACITY);
-    ExpectationSet usesMockAnimation;
-
-    usesMockCurve += EXPECT_CALL(*m_mockCompositorFactory, createAnimation(Ref(*mockCurvePtr), CompositorTargetProperty::OPACITY, _, _))
-        .WillOnce(Return(mockAnimationPtr));
-
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(CompositorAnimation::Direction::NORMAL));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setPlaybackRate(1));
-
-    EXPECT_CALL(*mockAnimationPtr, delete_())
-        .Times(1)
-        .After(usesMockAnimation);
-    EXPECT_CALL(*mockCurvePtr, delete_())
-        .Times(1)
-        .After(usesMockCurve);
-
-    // Go!
-    Vector<OwnPtr<CompositorAnimation>> result;
-    getAnimationOnCompositor(m_timing, *effect, result);
-    EXPECT_EQ(1U, result.size());
-    result[0].reset();
+    EXPECT_EQ(duration, keyframes[1].time);
 }
 
 TEST_F(AnimationCompositorAnimationsTest, createMultipleKeyframeOpacityAnimationLinear)
 {
     // KeyframeEffect to convert
     AnimatableValueKeyframeEffectModel* effect = createKeyframeEffectModel(
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(2.0).get(), 0),
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(-1.0).get(), 0.25),
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(20.0).get(), 0.5),
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(5.0).get(), 1.0));
 
     m_timing.iterationCount = 5;
     m_timing.direction = Timing::PlaybackDirectionAlternate;
     m_timing.playbackRate = 2.0;
-    // --
 
-    // Curve is created
-    WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock();
-    ExpectationSet usesMockCurve;
+    OwnPtr<CompositorAnimation> animation = convertToCompositorAnimation(*effect);
+    EXPECT_EQ(CompositorTargetProperty::OPACITY, animation->targetProperty());
+    EXPECT_EQ(5.0, animation->iterations());
+    EXPECT_EQ(0, animation->timeOffset());
+    EXPECT_EQ(CompositorAnimation::Direction::ALTERNATE_NORMAL, animation->getDirection());
+    EXPECT_EQ(2.0, animation->playbackRate());
 
-    EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())
-        .WillOnce(Return(mockCurvePtr));
+    OwnPtr<CompositorFloatAnimationCurve> keyframedFloatCurve = animation->floatCurveForTesting();
 
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addLinearKeyframe(CompositorFloatKeyframe(0.0, 2.0)));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addLinearKeyframe(CompositorFloatKeyframe(0.25, -1.0)));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addLinearKeyframe(CompositorFloatKeyframe(0.5, 20.0)));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addCubicBezierKeyframe(CompositorFloatKeyframe(1.0, 5.0), CubicBezierTimingFunction::EaseType::EASE));
+    Vector<CompositorFloatKeyframe> keyframes = keyframedFloatCurve->keyframesForTesting();
+    ASSERT_EQ(4UL, keyframes.size());
 
-    // KeyframeEffect is created
-    WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(CompositorTargetProperty::OPACITY);
-    ExpectationSet usesMockAnimation;
+    EXPECT_EQ(0, keyframes[0].time);
+    EXPECT_EQ(2.0f, keyframes[0].value);
+    EXPECT_TRUE(keyframedFloatCurve->keyframeHasLinearTimingFunctionForTesting(0));
 
-    usesMockCurve += EXPECT_CALL(*m_mockCompositorFactory, createAnimation(Ref(*mockCurvePtr), CompositorTargetProperty::OPACITY, _, _))
-        .WillOnce(Return(mockAnimationPtr));
+    EXPECT_EQ(0.25, keyframes[1].time);
+    EXPECT_EQ(-1.0f, keyframes[1].value);
+    EXPECT_TRUE(keyframedFloatCurve->keyframeHasLinearTimingFunctionForTesting(1));
 
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(CompositorAnimation::Direction::ALTERNATE_NORMAL));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setPlaybackRate(2.0));
+    EXPECT_EQ(0.5, keyframes[2].time);
+    EXPECT_EQ(20.0f, keyframes[2].value);
+    EXPECT_TRUE(keyframedFloatCurve->keyframeHasLinearTimingFunctionForTesting(2));
 
-    EXPECT_CALL(*mockAnimationPtr, delete_())
-        .Times(1)
-        .After(usesMockAnimation);
-    EXPECT_CALL(*mockCurvePtr, delete_())
-        .Times(1)
-        .After(usesMockCurve);
-
-    // Go!
-    Vector<OwnPtr<CompositorAnimation>> result;
-    getAnimationOnCompositor(m_timing, *effect, result);
-    EXPECT_EQ(1U, result.size());
-    result[0].reset();
+    EXPECT_EQ(1.0, keyframes[3].time);
+    EXPECT_EQ(5.0f, keyframes[3].value);
+    EXPECT_EQ(CubicBezierTimingFunction::EaseType::EASE, keyframedFloatCurve->getKeyframeEaseTypeForTesting(3));
 }
 
 TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationStartDelay)
 {
     // KeyframeEffect to convert
     AnimatableValueKeyframeEffectModel* effect = createKeyframeEffectModel(
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(2.0).get(), 0),
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(5.0).get(), 1.0));
 
+    const double startDelay = 3.25;
+
     m_timing.iterationCount = 5.0;
     m_timing.iterationDuration = 1.75;
-    m_timing.startDelay = 3.25;
-    // --
+    m_timing.startDelay = startDelay;
 
-    // Curve is created
-    WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;
-    ExpectationSet usesMockCurve;
-    EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())
-        .WillOnce(Return(mockCurvePtr));
+    OwnPtr<CompositorAnimation> animation = convertToCompositorAnimation(*effect);
 
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addLinearKeyframe(CompositorFloatKeyframe(0.0, 2.0)));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addCubicBezierKeyframe(CompositorFloatKeyframe(1.75, 5.0), CubicBezierTimingFunction::EaseType::EASE));
+    EXPECT_EQ(CompositorTargetProperty::OPACITY, animation->targetProperty());
+    EXPECT_EQ(5.0, animation->iterations());
+    EXPECT_EQ(-startDelay, animation->timeOffset());
 
-    // Create animation
-    WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(CompositorTargetProperty::OPACITY);
-    ExpectationSet usesMockAnimation;
+    OwnPtr<CompositorFloatAnimationCurve> keyframedFloatCurve = animation->floatCurveForTesting();
 
-    usesMockCurve += EXPECT_CALL(*m_mockCompositorFactory, createAnimation(Ref(*mockCurvePtr), CompositorTargetProperty::OPACITY, _, _))
-        .WillOnce(Return(mockAnimationPtr));
+    Vector<CompositorFloatKeyframe> keyframes = keyframedFloatCurve->keyframesForTesting();
+    ASSERT_EQ(2UL, keyframes.size());
 
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(-3.25));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(CompositorAnimation::Direction::NORMAL));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setPlaybackRate(1));
-
-    EXPECT_CALL(*mockAnimationPtr, delete_())
-        .Times(1)
-        .After(usesMockAnimation);
-    EXPECT_CALL(*mockCurvePtr, delete_())
-        .Times(1)
-        .After(usesMockCurve);
-
-    // Go!
-    Vector<OwnPtr<CompositorAnimation>> result;
-    getAnimationOnCompositor(m_timing, *effect, result);
-    EXPECT_EQ(1U, result.size());
-    result[0].reset();
+    EXPECT_EQ(1.75, keyframes[1].time);
+    EXPECT_EQ(5.0f, keyframes[1].value);
 }
 
 TEST_F(AnimationCompositorAnimationsTest, createMultipleKeyframeOpacityAnimationChained)
 {
     // KeyframeEffect to convert
     AnimatableValueKeyframeVector frames;
     frames.append(createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(2.0).get(), 0));
     frames.append(createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(-1.0).get(), 0.25));
     frames.append(createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(20.0).get(), 0.5));
     frames.append(createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(5.0).get(), 1.0));
     frames[0]->setEasing(m_cubicEaseTimingFunction.get());
     frames[1]->setEasing(m_linearTimingFunction.get());
     frames[2]->setEasing(m_cubicCustomTimingFunction.get());
     AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(frames);
 
     m_timing.timingFunction = m_linearTimingFunction.get();
     m_timing.iterationDuration = 2.0;
     m_timing.iterationCount = 10;
     m_timing.direction = Timing::PlaybackDirectionAlternate;
-    // --
 
-    // Curve is created
-    WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock();
-    ExpectationSet usesMockCurve;
+    OwnPtr<CompositorAnimation> animation = convertToCompositorAnimation(*effect);
+    EXPECT_EQ(CompositorTargetProperty::OPACITY, animation->targetProperty());
+    EXPECT_EQ(10.0, animation->iterations());
+    EXPECT_EQ(0, animation->timeOffset());
+    EXPECT_EQ(CompositorAnimation::Direction::ALTERNATE_NORMAL, animation->getDirection());
+    EXPECT_EQ(1.0, animation->playbackRate());
 
-    EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())
-        .WillOnce(Return(mockCurvePtr));
+    OwnPtr<CompositorFloatAnimationCurve> keyframedFloatCurve = animation->floatCurveForTesting();
 
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addCubicBezierKeyframe(CompositorFloatKeyframe(0.0, 2.0), CubicBezierTimingFunction::EaseType::EASE));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addLinearKeyframe(CompositorFloatKeyframe(0.5, -1.0)));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addCubicBezierKeyframe(CompositorFloatKeyframe(1.0, 20.0), 1.0, 2.0, 3.0, 4.0));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addCubicBezierKeyframe(CompositorFloatKeyframe(2.0, 5.0), CubicBezierTimingFunction::EaseType::EASE));
+    Vector<CompositorFloatKeyframe> keyframes = keyframedFloatCurve->keyframesForTesting();
+    ASSERT_EQ(4UL, keyframes.size());
 
-    // KeyframeEffect is created
-    WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(CompositorTargetProperty::OPACITY);
-    ExpectationSet usesMockAnimation;
+    EXPECT_EQ(0, keyframes[0].time);
+    EXPECT_EQ(2.0f, keyframes[0].value);
+    EXPECT_EQ(CubicBezierTimingFunction::EaseType::EASE, keyframedFloatCurve->getKeyframeEaseTypeForTesting(0));
 
-    usesMockCurve += EXPECT_CALL(*m_mockCompositorFactory, createAnimation(Ref(*mockCurvePtr), CompositorTargetProperty::OPACITY, _, _))
-        .WillOnce(Return(mockAnimationPtr));
+    EXPECT_EQ(0.5, keyframes[1].time);
+    EXPECT_EQ(-1.0f, keyframes[1].value);
+    EXPECT_TRUE(keyframedFloatCurve->keyframeHasLinearTimingFunctionForTesting(1));
 
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(10));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(CompositorAnimation::Direction::ALTERNATE_NORMAL));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setPlaybackRate(1));
+    EXPECT_EQ(1.0, keyframes[2].time);
+    EXPECT_EQ(20.0f, keyframes[2].value);
+    EXPECT_EQ(CubicBezierTimingFunction::EaseType::CUSTOM, keyframedFloatCurve->getKeyframeEaseTypeForTesting(2));
 
-    EXPECT_CALL(*mockAnimationPtr, delete_())
-        .Times(1)
-        .After(usesMockAnimation);
-    EXPECT_CALL(*mockCurvePtr, delete_())
-        .Times(1)
-        .After(usesMockCurve);
-
-    // Go!
-    Vector<OwnPtr<CompositorAnimation>> result;
-    getAnimationOnCompositor(m_timing, *effect, result);
-    EXPECT_EQ(1U, result.size());
-    result[0].reset();
+    EXPECT_EQ(2.0, keyframes[3].time);
+    EXPECT_EQ(5.0f, keyframes[3].value);
+    EXPECT_EQ(CubicBezierTimingFunction::EaseType::EASE, keyframedFloatCurve->getKeyframeEaseTypeForTesting(3));
 }
 
 TEST_F(AnimationCompositorAnimationsTest, createReversedOpacityAnimation)
 {
     RefPtr<TimingFunction> cubicEasyFlipTimingFunction = CubicBezierTimingFunction::create(0.0, 0.0, 0.0, 1.0);
 
     // KeyframeEffect to convert
     AnimatableValueKeyframeVector frames;
     frames.append(createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(2.0).get(), 0));
     frames.append(createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(-1.0).get(), 0.25));
     frames.append(createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(20.0).get(), 0.5));
     frames.append(createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(5.0).get(), 1.0));
     frames[0]->setEasing(CubicBezierTimingFunction::preset(CubicBezierTimingFunction::EaseType::EASE_IN));
     frames[1]->setEasing(m_linearTimingFunction.get());
     frames[2]->setEasing(cubicEasyFlipTimingFunction.get());
     AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(frames);
 
     m_timing.timingFunction = m_linearTimingFunction.get();
     m_timing.iterationCount = 10;
     m_timing.direction = Timing::PlaybackDirectionAlternateReverse;
-    // --
 
-    // Curve is created
-    WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock();
-    ExpectationSet usesMockCurve;
+    OwnPtr<CompositorAnimation> animation = convertToCompositorAnimation(*effect);
+    EXPECT_EQ(CompositorTargetProperty::OPACITY, animation->targetProperty());
+    EXPECT_EQ(10.0, animation->iterations());
+    EXPECT_EQ(0, animation->timeOffset());
+    EXPECT_EQ(CompositorAnimation::Direction::ALTERNATE_REVERSE, animation->getDirection());
+    EXPECT_EQ(1.0, animation->playbackRate());
 
-    EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())
-        .WillOnce(Return(mockCurvePtr));
+    OwnPtr<CompositorFloatAnimationCurve> keyframedFloatCurve = animation->floatCurveForTesting();
 
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addCubicBezierKeyframe(CompositorFloatKeyframe(0.0, 2.0), CubicBezierTimingFunction::EaseType::EASE_IN));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addLinearKeyframe(CompositorFloatKeyframe(0.25, -1.0)));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addCubicBezierKeyframe(CompositorFloatKeyframe(0.5, 20.0), 0.0, 0.0, 0.0, 1.0));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addCubicBezierKeyframe(CompositorFloatKeyframe(1.0, 5.0), CubicBezierTimingFunction::EaseType::EASE));
+    Vector<CompositorFloatKeyframe> keyframes = keyframedFloatCurve->keyframesForTesting();
+    ASSERT_EQ(4UL, keyframes.size());
 
-    // Create the animation
-    WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(CompositorTargetProperty::OPACITY);
-    ExpectationSet usesMockAnimation;
+    EXPECT_TRUE(keyframedFloatCurve->curveHasLinearTimingFunctionForTesting());
 
-    usesMockCurve += EXPECT_CALL(*m_mockCompositorFactory, createAnimation(Ref(*mockCurvePtr), CompositorTargetProperty::OPACITY, _, _))
-        .WillOnce(Return(mockAnimationPtr));
+    EXPECT_EQ(0, keyframes[0].time);
+    EXPECT_EQ(2.0f, keyframes[0].value);
+    EXPECT_EQ(CubicBezierTimingFunction::EaseType::EASE_IN, keyframedFloatCurve->getKeyframeEaseTypeForTesting(0));
 
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(10));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(CompositorAnimation::Direction::ALTERNATE_REVERSE));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setPlaybackRate(1));
+    EXPECT_EQ(0.25, keyframes[1].time);
+    EXPECT_EQ(-1.0f, keyframes[1].value);
+    EXPECT_TRUE(keyframedFloatCurve->keyframeHasLinearTimingFunctionForTesting(1));
 
-    EXPECT_CALL(*mockAnimationPtr, delete_())
-        .Times(1)
-        .After(usesMockAnimation);
-    EXPECT_CALL(*mockCurvePtr, delete_())
-        .Times(1)
-        .After(usesMockCurve);
+    EXPECT_EQ(0.5, keyframes[2].time);
+    EXPECT_EQ(20.0f, keyframes[2].value);
+    EXPECT_EQ(CubicBezierTimingFunction::EaseType::CUSTOM, keyframedFloatCurve->getKeyframeEaseTypeForTesting(2));
 
-    // Go!
-    Vector<OwnPtr<CompositorAnimation>> result;
-    getAnimationOnCompositor(m_timing, *effect, result);
-    EXPECT_EQ(1U, result.size());
-    result[0].reset();
+    EXPECT_EQ(1.0, keyframes[3].time);
+    EXPECT_EQ(5.0f, keyframes[3].value);
+    EXPECT_EQ(CubicBezierTimingFunction::EaseType::EASE, keyframedFloatCurve->getKeyframeEaseTypeForTesting(3));
 }
 
 TEST_F(AnimationCompositorAnimationsTest, createReversedOpacityAnimationNegativeStartDelay)
 {
     // KeyframeEffect to convert
     AnimatableValueKeyframeEffectModel* effect = createKeyframeEffectModel(
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(2.0).get(), 0),
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(5.0).get(), 1.0));
 
+    const double negativeStartDelay = -3;
+
     m_timing.iterationCount = 5.0;
     m_timing.iterationDuration = 1.5;
-    m_timing.startDelay = -3;
+    m_timing.startDelay = negativeStartDelay;
     m_timing.direction = Timing::PlaybackDirectionAlternateReverse;
-    // --
 
-    // Curve is created
-    WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;
-    ExpectationSet usesMockCurve;
-    EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())
-        .WillOnce(Return(mockCurvePtr));
+    OwnPtr<CompositorAnimation> animation = convertToCompositorAnimation(*effect);
+    EXPECT_EQ(CompositorTargetProperty::OPACITY, animation->targetProperty());
+    EXPECT_EQ(5.0, animation->iterations());
+    EXPECT_EQ(-negativeStartDelay, animation->timeOffset());
+    EXPECT_EQ(CompositorAnimation::Direction::ALTERNATE_REVERSE, animation->getDirection());
+    EXPECT_EQ(1.0, animation->playbackRate());
 
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addLinearKeyframe(CompositorFloatKeyframe(0.0, 2.0)));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addCubicBezierKeyframe(CompositorFloatKeyframe(1.5, 5.0), CubicBezierTimingFunction::EaseType::EASE));
+    OwnPtr<CompositorFloatAnimationCurve> keyframedFloatCurve = animation->floatCurveForTesting();
 
-    // Create animation
-    WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(CompositorTargetProperty::OPACITY);
-    ExpectationSet usesMockAnimation;
-
-    usesMockCurve += EXPECT_CALL(*m_mockCompositorFactory, createAnimation(Ref(*mockCurvePtr), CompositorTargetProperty::OPACITY, _, _))
-        .WillOnce(Return(mockAnimationPtr));
-
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(3.0));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(CompositorAnimation::Direction::ALTERNATE_REVERSE));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setPlaybackRate(1));
-
-    EXPECT_CALL(*mockAnimationPtr, delete_())
-        .Times(1)
-        .After(usesMockAnimation);
-    EXPECT_CALL(*mockCurvePtr, delete_())
-        .Times(1)
-        .After(usesMockCurve);
-
-    // Go!
-    Vector<OwnPtr<CompositorAnimation>> result;
-    getAnimationOnCompositor(m_timing, *effect, result);
-    EXPECT_EQ(1U, result.size());
-    result[0].reset();
+    Vector<CompositorFloatKeyframe> keyframes = keyframedFloatCurve->keyframesForTesting();
+    ASSERT_EQ(2UL, keyframes.size());
 }
 
 TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationPlaybackRates)
 {
     // KeyframeEffect to convert
     AnimatableValueKeyframeEffectModel* effect = createKeyframeEffectModel(
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(2.0).get(), 0),
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(5.0).get(), 1.0));
 
-    m_timing.playbackRate = 2;
-    // --
+    const double playbackRate = 2;
+    const double playerPlaybackRate = -1.5;
 
-    // Curve is created
-    WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;
-    ExpectationSet usesMockCurve;
-    EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())
-        .WillOnce(Return(mockCurvePtr));
+    m_timing.playbackRate = playbackRate;
 
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addLinearKeyframe(CompositorFloatKeyframe(0.0, 2.0)));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addCubicBezierKeyframe(CompositorFloatKeyframe(1.0, 5.0), CubicBezierTimingFunction::EaseType::EASE));
+    OwnPtr<CompositorAnimation> animation = convertToCompositorAnimation(*effect, playerPlaybackRate);
+    EXPECT_EQ(CompositorTargetProperty::OPACITY, animation->targetProperty());
+    EXPECT_EQ(1.0, animation->iterations());
+    EXPECT_EQ(0, animation->timeOffset());
+    EXPECT_EQ(CompositorAnimation::Direction::NORMAL, animation->getDirection());
+    EXPECT_EQ(playbackRate * playerPlaybackRate, animation->playbackRate());
 
-    // Create animation
-    WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(CompositorTargetProperty::OPACITY);
-    ExpectationSet usesMockAnimation;
+    OwnPtr<CompositorFloatAnimationCurve> keyframedFloatCurve = animation->floatCurveForTesting();
 
-    usesMockCurve += EXPECT_CALL(*m_mockCompositorFactory, createAnimation(Ref(*mockCurvePtr), CompositorTargetProperty::OPACITY, _, _))
-        .WillOnce(Return(mockAnimationPtr));
-
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(CompositorAnimation::Direction::NORMAL));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setPlaybackRate(-3));
-
-    EXPECT_CALL(*mockAnimationPtr, delete_())
-        .Times(1)
-        .After(usesMockAnimation);
-    EXPECT_CALL(*mockCurvePtr, delete_())
-        .Times(1)
-        .After(usesMockCurve);
-
-    // Go!
-    Vector<OwnPtr<CompositorAnimation>> result;
-    // Set player plaback rate also
-    getAnimationOnCompositor(m_timing, *effect, result, -1.5);
-    EXPECT_EQ(1U, result.size());
-    result[0].reset();
+    Vector<CompositorFloatKeyframe> keyframes = keyframedFloatCurve->keyframesForTesting();
+    ASSERT_EQ(2UL, keyframes.size());
 }
 
 TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationFillModeNone)
 {
     // KeyframeEffect to convert
     AnimatableValueKeyframeEffectModel* effect = createKeyframeEffectModel(
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(2.0).get(), 0),
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(5.0).get(), 1.0));
 
     m_timing.fillMode = Timing::FillModeNone;
 
-    // Curve is created
-    WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;
-    ExpectationSet usesMockCurve;
-    EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())
-        .WillOnce(Return(mockCurvePtr));
-
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addLinearKeyframe(CompositorFloatKeyframe(0.0, 2.0)));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addCubicBezierKeyframe(CompositorFloatKeyframe(1.0, 5.0), CubicBezierTimingFunction::EaseType::EASE));
-
-    // Create animation
-    WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(CompositorTargetProperty::OPACITY);
-    ExpectationSet usesMockAnimation;
-
-    usesMockCurve += EXPECT_CALL(*m_mockCompositorFactory, createAnimation(Ref(*mockCurvePtr), CompositorTargetProperty::OPACITY, _, _))
-        .WillOnce(Return(mockAnimationPtr));
-
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(CompositorAnimation::Direction::NORMAL));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setPlaybackRate(1));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setFillMode(CompositorAnimation::FillMode::NONE));
-
-    EXPECT_CALL(*mockAnimationPtr, delete_())
-        .Times(1)
-        .After(usesMockAnimation);
-    EXPECT_CALL(*mockCurvePtr, delete_())
-        .Times(1)
-        .After(usesMockCurve);
-
-    // Go!
-    Vector<OwnPtr<CompositorAnimation>> result;
-    getAnimationOnCompositor(m_timing, *effect, result);
-    EXPECT_EQ(1U, result.size());
-    result[0].reset();
+    OwnPtr<CompositorAnimation> animation = convertToCompositorAnimation(*effect);
+    EXPECT_EQ(CompositorAnimation::FillMode::NONE, animation->getFillMode());
 }
 
 TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationFillModeAuto)
 {
     // KeyframeEffect to convert
     AnimatableValueKeyframeEffectModel* effect = createKeyframeEffectModel(
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(2.0).get(), 0),
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(5.0).get(), 1.0));
 
     m_timing.fillMode = Timing::FillModeAuto;
 
-    // Curve is created
-    WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;
-    ExpectationSet usesMockCurve;
-    EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())
-        .WillOnce(Return(mockCurvePtr));
-
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addLinearKeyframe(CompositorFloatKeyframe(0.0, 2.0)));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addCubicBezierKeyframe(CompositorFloatKeyframe(1.0, 5.0), CubicBezierTimingFunction::EaseType::EASE));
-
-    // Create animation
-    WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(CompositorTargetProperty::OPACITY);
-    ExpectationSet usesMockAnimation;
-
-    usesMockCurve += EXPECT_CALL(*m_mockCompositorFactory, createAnimation(Ref(*mockCurvePtr), CompositorTargetProperty::OPACITY, _, _))
-        .WillOnce(Return(mockAnimationPtr));
-
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(CompositorAnimation::Direction::NORMAL));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setPlaybackRate(1));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setFillMode(CompositorAnimation::FillMode::NONE));
-
-    EXPECT_CALL(*mockAnimationPtr, delete_())
-        .Times(1)
-        .After(usesMockAnimation);
-    EXPECT_CALL(*mockCurvePtr, delete_())
-        .Times(1)
-        .After(usesMockCurve);
-
-    // Go!
-    Vector<OwnPtr<CompositorAnimation>> result;
-    getAnimationOnCompositor(m_timing, *effect, result);
-    EXPECT_EQ(1U, result.size());
-    result[0].reset();
+    OwnPtr<CompositorAnimation> animation = convertToCompositorAnimation(*effect);
+    EXPECT_EQ(CompositorTargetProperty::OPACITY, animation->targetProperty());
+    EXPECT_EQ(1.0, animation->iterations());
+    EXPECT_EQ(0, animation->timeOffset());
+    EXPECT_EQ(CompositorAnimation::Direction::NORMAL, animation->getDirection());
+    EXPECT_EQ(1.0, animation->playbackRate());
+    EXPECT_EQ(CompositorAnimation::FillMode::NONE, animation->getFillMode());
 }
 
 TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationWithTimingFunction)
 {
     // KeyframeEffect to convert
     AnimatableValueKeyframeEffectModel* effect = createKeyframeEffectModel(
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(2.0).get(), 0),
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(5.0).get(), 1.0));
 
     m_timing.timingFunction = m_cubicCustomTimingFunction;
 
-    // Curve is created
-    WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;
-    ExpectationSet usesMockCurve;
-    EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())
-        .WillOnce(Return(mockCurvePtr));
+    OwnPtr<CompositorAnimation> animation = convertToCompositorAnimation(*effect);
 
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addLinearKeyframe(CompositorFloatKeyframe(0.0, 2.0)));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, addCubicBezierKeyframe(CompositorFloatKeyframe(1.0, 5.0), CubicBezierTimingFunction::EaseType::EASE));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, setCubicBezierTimingFunction(1, 2, 3, 4));
+    OwnPtr<CompositorFloatAnimationCurve> keyframedFloatCurve = animation->floatCurveForTesting();
 
-    // Create animation
-    WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(CompositorTargetProperty::OPACITY);
-    ExpectationSet usesMockAnimation;
+    Vector<CompositorFloatKeyframe> keyframes = keyframedFloatCurve->keyframesForTesting();
+    ASSERT_EQ(2UL, keyframes.size());
 
-    usesMockCurve += EXPECT_CALL(*m_mockCompositorFactory, createAnimation(Ref(*mockCurvePtr), CompositorTargetProperty::OPACITY, _, _))
-        .WillOnce(Return(mockAnimationPtr));
+    EXPECT_EQ(CubicBezierTimingFunction::EaseType::CUSTOM, keyframedFloatCurve->getCurveEaseTypeForTesting());
 
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(CompositorAnimation::Direction::NORMAL));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setPlaybackRate(1));
+    EXPECT_EQ(0, keyframes[0].time);
+    EXPECT_EQ(2.0f, keyframes[0].value);
+    EXPECT_TRUE(keyframedFloatCurve->keyframeHasLinearTimingFunctionForTesting(0));
 
-    EXPECT_CALL(*mockAnimationPtr, delete_())
-        .Times(1)
-        .After(usesMockAnimation);
-    EXPECT_CALL(*mockCurvePtr, delete_())
-        .Times(1)
-        .After(usesMockCurve);
-
-    // Go!
-    Vector<OwnPtr<CompositorAnimation>> result;
-    getAnimationOnCompositor(m_timing, *effect, result);
-    EXPECT_EQ(1U, result.size());
-    result[0].reset();
+    EXPECT_EQ(1.0, keyframes[1].time);
+    EXPECT_EQ(5.0f, keyframes[1].value);
+    EXPECT_EQ(CubicBezierTimingFunction::EaseType::EASE, keyframedFloatCurve->getKeyframeEaseTypeForTesting(1));
 }
 
-TEST_F(AnimationCompositorAnimationsTest, CancelIncompatibleCompositorAnimations)
+TEST_F(AnimationCompositorAnimationsTest, cancelIncompatibleCompositorAnimations)
 {
     Persistent<Element> element = m_document->createElement("shared", ASSERT_NO_EXCEPTION);
 
     LayoutObjectProxy* layoutObject = LayoutObjectProxy::create(element.get());
     element->setLayoutObject(layoutObject);
 
     AnimatableValueKeyframeVector keyFrames;
     keyFrames.append(createDefaultKeyframe(CSSPropertyOpacity, EffectModel::CompositeReplace, 0.0).get());
     keyFrames.append(createDefaultKeyframe(CSSPropertyOpacity, EffectModel::CompositeReplace, 1.0).get());
     EffectModel* animationEffect1 = AnimatableValueKeyframeEffectModel::create(keyFrames);
@@ skipping 30 matching lines @@
     simulateFrame(1.);
 
     element->setLayoutObject(nullptr);
     LayoutObjectProxy::dispose(layoutObject);
 
     ThreadHeap::collectAllGarbage();
     EXPECT_TRUE(element->elementAnimations()->animations().isEmpty());
 }
 
 } // namespace blink