Web Animations CSS: More cleaning of new CompositorAnimation code.

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 25 matching lines @@
 #include "core/animation/AnimatableTransform.h"
 #include "core/animation/AnimatableValueTestHelper.h"
 #include "core/animation/CompositorAnimationsImpl.h"
 #include "core/animation/CompositorAnimationsTestHelper.h"
 #include "core/platform/animation/TimingFunctionTestHelper.h"
 #include "core/platform/graphics/filters/FilterOperations.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/transforms/TransformOperations.h"
 #include "platform/transforms/TranslateTransformOperation.h"
 #include "public/platform/WebAnimation.h"
+#include "wtf/HashFunctions.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 namespace WebCore {
 
 using ::testing::CloneToPassOwnPtr;
 using ::testing::ExpectationSet;
 using ::testing::Ref;
 using ::testing::Return;
 using ::testing::_;
 
 class CoreAnimationCompositorAnimationsTest : public CoreAnimationCompositorAnimationsTestBase {
 
 protected:
     RefPtr<TimingFunction> m_linearTimingFunction;
     RefPtr<TimingFunction> m_cubicEaseTimingFunction;
     RefPtr<TimingFunction> m_cubicCustomTimingFunction;
     RefPtr<TimingFunction> m_stepTimingFunction;
 
     Timing m_timing;
+    CompositorAnimationsImpl::CompositorTiming m_compositorTiming;
     KeyframeAnimationEffect::KeyframeVector m_keyframeVector2;
     KeyframeAnimationEffect::KeyframeVector m_keyframeVector5;
 
     virtual void SetUp()
     {
         CoreAnimationCompositorAnimationsTestBase::SetUp();
 
         m_linearTimingFunction = LinearTimingFunction::create();
         m_cubicEaseTimingFunction = CubicBezierTimingFunction::preset(CubicBezierTimingFunction::Ease);
         m_cubicCustomTimingFunction = CubicBezierTimingFunction::create(1, 2, 3, 4);
         m_stepTimingFunction = StepsTimingFunction::create(1, false);
 
         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_keyframeVector5 = createCompositableFloatKeyframeVector(5);
     }
 
 public:
 
+    bool convertTimingForCompositor(const Timing& t, CompositorAnimationsImpl::CompositorTiming& out)
+    {
+        return CompositorAnimationsImpl::convertTimingForCompositor(t, out);
+    }
     bool isCandidateForCompositor(const Timing& t, KeyframeAnimationEffect::KeyframeVector& frames)
     {
         return CompositorAnimationsImpl::isCandidateForCompositor(t, frames);
     }
     bool isCandidateForCompositor(TimingFunction& t, KeyframeAnimationEffect::KeyframeVector& frames)
     {
         return CompositorAnimationsImpl::isCandidateForCompositor(t, frames);
     }
     bool isCandidateForCompositor(const Keyframe& k)
     {
@@ skipping 119 matching lines @@
         isCandidateForCompositor(
             *createDefaultKeyframe(CSSPropertyColor, AnimationEffect::CompositeReplace).get()));
 
     EXPECT_FALSE(
         isCandidateForCompositor(
             *createDefaultKeyframe(CSSPropertyColor, AnimationEffect::CompositeAdd).get()));
 }
 
 TEST_F(CoreAnimationCompositorAnimationsTest, isCandidateForCompositorKeyframeMultipleCSSProperties)
 {
+    // In this test, we cheat by using an AnimatableDouble even with Transform
+    // as the actual value isn't considered.
     RefPtr<Keyframe> keyframeGoodMultiple = createDefaultKeyframe(CSSPropertyOpacity, AnimationEffect::CompositeReplace);
-    // Cheat by using an AnimatableDouble as creating a AnimatableTransform is much harder.
     keyframeGoodMultiple->setPropertyValue(CSSPropertyWebkitTransform, AnimatableDouble::create(10.0).get());
     EXPECT_TRUE(isCandidateForCompositor(*keyframeGoodMultiple.get()));
 
     RefPtr<Keyframe> keyframeBadMultipleOp = createDefaultKeyframe(CSSPropertyOpacity, AnimationEffect::CompositeAdd);
-    // Cheat by using an AnimatableDouble as creating a AnimatableTransform is much harder.
     keyframeBadMultipleOp->setPropertyValue(CSSPropertyWebkitTransform, AnimatableDouble::create(10.0).get());
     EXPECT_FALSE(isCandidateForCompositor(*keyframeBadMultipleOp.get()));
 
-    RefPtr<Keyframe> keyframeBadMultipleID = createDefaultKeyframe(CSSPropertyOpacity, AnimationEffect::CompositeReplace);
-    keyframeBadMultipleID->setPropertyValue(CSSPropertyColor, AnimatableDouble::create(10.0).get());
-    EXPECT_FALSE(isCandidateForCompositor(*keyframeBadMultipleID.get()));
+    // Check both an unsupported property which hashes before and after the
+    // supported property.
+    typedef DefaultHash<CSSPropertyID>::Hash HashFunctions;
+
+    RefPtr<Keyframe> keyframeBadMultiple1ID = createDefaultKeyframe(CSSPropertyColor, AnimationEffect::CompositeReplace);
+    keyframeBadMultiple1ID->setPropertyValue(CSSPropertyOpacity, AnimatableDouble::create(10.0).get());
+    EXPECT_FALSE(isCandidateForCompositor(*keyframeBadMultiple1ID.get()));
+    EXPECT_LT(HashFunctions::hash(CSSPropertyColor), HashFunctions::hash(CSSPropertyOpacity));
+
+    RefPtr<Keyframe> keyframeBadMultiple2ID = createDefaultKeyframe(CSSPropertyWebkitTransform, AnimationEffect::CompositeReplace);
+    keyframeBadMultiple2ID->setPropertyValue(CSSPropertyWidth, AnimatableDouble::create(10.0).get());
+    EXPECT_FALSE(isCandidateForCompositor(*keyframeBadMultiple2ID.get()));
+    EXPECT_GT(HashFunctions::hash(CSSPropertyWebkitTransform), HashFunctions::hash(CSSPropertyWidth));
 }
 
 TEST_F(CoreAnimationCompositorAnimationsTest, isCandidateForCompositorKeyframeEffectGoodSingleFrame)
 {
     KeyframeAnimationEffect::KeyframeVector frames;
     frames.append(createDefaultKeyframe(CSSPropertyOpacity, AnimationEffect::CompositeReplace).get());
     EXPECT_TRUE(isCandidateForCompositor(*KeyframeAnimationEffect::create(frames).get()));
 }
 
 TEST_F(CoreAnimationCompositorAnimationsTest, isCandidateForCompositorKeyframeEffectBadSingleFrame)
@@ skipping 27 matching lines @@
     framesMixedProperties.append(createDefaultKeyframe(CSSPropertyOpacity, AnimationEffect::CompositeReplace, 0.0).get());
     framesMixedProperties.append(createDefaultKeyframe(CSSPropertyColor, AnimationEffect::CompositeReplace, 1.0).get());
     EXPECT_FALSE(isCandidateForCompositor(*KeyframeAnimationEffect::create(framesMixedProperties).get()));
 
     KeyframeAnimationEffect::KeyframeVector framesMixedOps;
     framesMixedOps.append(createDefaultKeyframe(CSSPropertyOpacity, AnimationEffect::CompositeReplace, 0.0).get());
     framesMixedOps.append(createDefaultKeyframe(CSSPropertyOpacity, AnimationEffect::CompositeAdd, 1.0).get());
     EXPECT_FALSE(isCandidateForCompositor(*KeyframeAnimationEffect::create(framesMixedOps).get()));
 }
 
-TEST_F(CoreAnimationCompositorAnimationsTest, isCandidateForCompositorTimingStartDelay)
+TEST_F(CoreAnimationCompositorAnimationsTest, ConvertTimingForCompositorStartDelay)
 {
+    m_timing.iterationDuration = 20.0;
+
     m_timing.startDelay = 2.0;
+    EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming));
+
+    m_timing.startDelay = -2.0;
+    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
+    EXPECT_DOUBLE_EQ(-2.0, m_compositorTiming.scaledTimeOffset);
+}
+
+TEST_F(CoreAnimationCompositorAnimationsTest, ConvertTimingForCompositorIterationStart)
+{
+    m_timing.iterationStart = 2.2;
+    EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming));
+}
+
+TEST_F(CoreAnimationCompositorAnimationsTest, ConvertTimingForCompositorIterationCount)
+{
+    m_timing.iterationCount = 5.0;
+    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
+    EXPECT_EQ(5, m_compositorTiming.adjustedIterationCount);
+
+    m_timing.iterationCount = 5.5;
+    EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming));
+
+    m_timing.iterationCount = std::numeric_limits<double>::infinity();
+    EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming));
+
+#ifndef NDEBUG
+    m_timing.iterationCount = -1;
+    EXPECT_DEATH(convertTimingForCompositor(m_timing, m_compositorTiming), "");
+#endif
+}
+
+TEST_F(CoreAnimationCompositorAnimationsTest, ConvertTimingForCompositorIterationsAndStartDelay)
+{
+    m_timing.iterationCount = 4.0;
+    m_timing.iterationDuration = 5.0;
+
+    m_timing.startDelay = -6.0;
+    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
+    EXPECT_DOUBLE_EQ(-1.0, m_compositorTiming.scaledTimeOffset);
+    EXPECT_DOUBLE_EQ(3.0, m_compositorTiming.adjustedIterationCount);
+    EXPECT_FALSE(m_compositorTiming.reverse);
+
+    m_timing.iterationCount = 1.0;
+    m_timing.iterationDuration = 5.0;
+    m_timing.startDelay = -6.0;
+    EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming));
+
+    m_timing.iterationCount = 5.0;
+    m_timing.iterationDuration = 1.0;
+    m_timing.startDelay = -6.0;
+    EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming));
+}
+
+TEST_F(CoreAnimationCompositorAnimationsTest, ConvertTimingForCompositorPlaybackRate)
+{
+    m_timing.playbackRate = 2.0;
+    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
+
+    m_timing.playbackRate = 0.0;
+    EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming));
+
+    m_timing.playbackRate = -2.0;
+    EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming));
+}
+
+TEST_F(CoreAnimationCompositorAnimationsTest, ConvertTimingForCompositorPlaybackRateAdjustsDuration)
+{
+    m_timing.iterationDuration = 10.0;
+    m_timing.playbackRate = 2.0;
+    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
+    EXPECT_DOUBLE_EQ(5.0, m_compositorTiming.scaledDuration);
+}
+
+TEST_F(CoreAnimationCompositorAnimationsTest, ConvertTimingForCompositorPlaybackRateAdjustsOffset)
+{
+    m_timing.iterationDuration = 12.0;
+    m_timing.playbackRate = 2.0;
+    m_timing.startDelay = -5.0;
+    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
+    EXPECT_DOUBLE_EQ(6.0, m_compositorTiming.scaledDuration);
+    EXPECT_DOUBLE_EQ(-2.5, m_compositorTiming.scaledTimeOffset);
+}
+
+TEST_F(CoreAnimationCompositorAnimationsTest, ConvertTimingForCompositorDirection)
+{
+    m_timing.direction = Timing::PlaybackDirectionAlternate;
+    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
+    EXPECT_TRUE(m_compositorTiming.alternate);
+    EXPECT_FALSE(m_compositorTiming.reverse);
+
+    m_timing.direction = Timing::PlaybackDirectionAlternateReverse;
+    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
+    EXPECT_TRUE(m_compositorTiming.alternate);
+    EXPECT_TRUE(m_compositorTiming.reverse);
+
+    m_timing.direction = Timing::PlaybackDirectionReverse;
+    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
+    EXPECT_FALSE(m_compositorTiming.alternate);
+    EXPECT_TRUE(m_compositorTiming.reverse);
+}
+
+TEST_F(CoreAnimationCompositorAnimationsTest, ConvertTimingForCompositorDirectionIterationsAndStartDelay)
+{
+    m_timing.direction = Timing::PlaybackDirectionAlternate;
+    m_timing.iterationCount = 4.0;
+    m_timing.iterationDuration = 5.0;
+    m_timing.startDelay = -6.0;
+    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
+    EXPECT_DOUBLE_EQ(-1.0, m_compositorTiming.scaledTimeOffset);
+    EXPECT_EQ(3, m_compositorTiming.adjustedIterationCount);
+    EXPECT_TRUE(m_compositorTiming.alternate);
+    EXPECT_TRUE(m_compositorTiming.reverse);
+
+    m_timing.direction = Timing::PlaybackDirectionAlternate;
+    m_timing.iterationCount = 4.0;
+    m_timing.iterationDuration = 5.0;
+    m_timing.startDelay = -11.0;
+    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
+    EXPECT_DOUBLE_EQ(-1.0, m_compositorTiming.scaledTimeOffset);
+    EXPECT_EQ(2, m_compositorTiming.adjustedIterationCount);
+    EXPECT_TRUE(m_compositorTiming.alternate);
+    EXPECT_FALSE(m_compositorTiming.reverse);
+
+    m_timing.direction = Timing::PlaybackDirectionAlternateReverse;
+    m_timing.iterationCount = 4.0;
+    m_timing.iterationDuration = 5.0;
+    m_timing.startDelay = -6.0;
+    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
+    EXPECT_DOUBLE_EQ(-1.0, m_compositorTiming.scaledTimeOffset);
+    EXPECT_EQ(3, m_compositorTiming.adjustedIterationCount);
+    EXPECT_TRUE(m_compositorTiming.alternate);
+    EXPECT_FALSE(m_compositorTiming.reverse);
+
+    m_timing.direction = Timing::PlaybackDirectionAlternateReverse;
+    m_timing.iterationCount = 4.0;
+    m_timing.iterationDuration = 5.0;
+    m_timing.startDelay = -11.0;
+    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
+    EXPECT_DOUBLE_EQ(-1.0, m_compositorTiming.scaledTimeOffset);
+    EXPECT_EQ(2, m_compositorTiming.adjustedIterationCount);
+    EXPECT_TRUE(m_compositorTiming.alternate);
+    EXPECT_TRUE(m_compositorTiming.reverse);
+}
+
+TEST_F(CoreAnimationCompositorAnimationsTest, isCandidateForCompositorTiming)
+{
     EXPECT_TRUE(isCandidateForCompositor(m_timing, m_keyframeVector2));
 
-    m_timing.iterationCount = 5.0;
     m_timing.startDelay = 2.0;
     EXPECT_FALSE(isCandidateForCompositor(m_timing, m_keyframeVector2));
-
-    m_timing.iterationCount = 5.0;
-    m_timing.startDelay = -2.0;
-    EXPECT_TRUE(isCandidateForCompositor(m_timing, m_keyframeVector2));
-}
-
-TEST_F(CoreAnimationCompositorAnimationsTest, isCandidateForCompositorTimingFillMode)
-{
-    m_timing.fillMode = Timing::FillModeForwards;
-    EXPECT_FALSE(isCandidateForCompositor(m_timing, m_keyframeVector2));
 }
 
-TEST_F(CoreAnimationCompositorAnimationsTest, isCandidateForCompositorTimingIterationStart)
-{
-    m_timing.iterationStart = 2.2;
-    EXPECT_FALSE(isCandidateForCompositor(m_timing, m_keyframeVector2));
-}
-
-TEST_F(CoreAnimationCompositorAnimationsTest, isCandidateForCompositorTimingIterationCount)
-{
-    m_timing.iterationCount = 5.0;
-    EXPECT_TRUE(isCandidateForCompositor(m_timing, m_keyframeVector2));
-
-    m_timing.iterationCount = 5.5;
-    EXPECT_FALSE(isCandidateForCompositor(m_timing, m_keyframeVector2));
-
-    m_timing.iterationCount = -1.0;
-    EXPECT_FALSE(isCandidateForCompositor(m_timing, m_keyframeVector2));
-
-    m_timing.iterationCount = std::numeric_limits<double>::infinity();
-    EXPECT_FALSE(isCandidateForCompositor(m_timing, m_keyframeVector2));
-
-    m_timing.iterationCount = -std::numeric_limits<double>::infinity();
-    EXPECT_FALSE(isCandidateForCompositor(m_timing, m_keyframeVector2));
-}
-
-TEST_F(CoreAnimationCompositorAnimationsTest, isCandidateForCompositorTimingIterationDuration)
-{
-    m_timing.hasIterationDuration = false;
-    EXPECT_FALSE(isCandidateForCompositor(m_timing, m_keyframeVector2));
-}
-
-TEST_F(CoreAnimationCompositorAnimationsTest, isCandidateForCompositorTimingPlaybackRate)
-{
-    m_timing.playbackRate = 2.0;
-    EXPECT_TRUE(isCandidateForCompositor(m_timing, m_keyframeVector2));
-}
-
 TEST_F(CoreAnimationCompositorAnimationsTest, isCandidateForCompositorTimingTimingFunctionPassThru)
 {
     m_timing.timingFunction = m_stepTimingFunction;
     EXPECT_FALSE(isCandidateForCompositor(m_timing, m_keyframeVector2));
 }
 
 TEST_F(CoreAnimationCompositorAnimationsTest, isCandidateForCompositorTimingFunctionLinear)
 {
     EXPECT_TRUE(isCandidateForCompositor(*m_linearTimingFunction.get(), m_keyframeVector2));
     EXPECT_TRUE(isCandidateForCompositor(*m_linearTimingFunction.get(), m_keyframeVector5));
@@ skipping 240 matching lines @@
     usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.0, 5.0)));
 
     // Create animation
     blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blink::WebAnimation::TargetPropertyOpacity);
     ExpectationSet usesMockAnimation;
 
     usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebAnimation::TargetPropertyOpacity, _))
         .WillOnce(Return(mockAnimationPtr));
 
     usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1));
+    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0));
     usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(false));
 
     EXPECT_CALL(*mockAnimationPtr, delete_())
         .Times(1)
         .After(usesMockAnimation);
     EXPECT_CALL(*mockCurvePtr, delete_())
         .Times(1)
         .After(usesMockCurve);
 
     // Go!
     setCompositorForTesting(mockCompositor);
     Vector<OwnPtr<blink::WebAnimation> > result;
     getCompositorAnimations(m_timing, *effect.get(), result);
     EXPECT_EQ(1U, result.size());
     result[0].clear();
 }
 
-TEST_F(CoreAnimationCompositorAnimationsTest, createSimpleOpacityAnimationDurationPlaybackOffset)
+TEST_F(CoreAnimationCompositorAnimationsTest, createSimpleOpacityAnimationDurationPlayback)
 {
     // Animation to convert
     RefPtr<KeyframeAnimationEffect> effect = createKeyframeAnimationEffect(
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(2.0).get(), 0),
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(5.0).get(), 1.0));
 
     m_timing.iterationDuration = 10.0;
     m_timing.playbackRate = 2.0;
-    m_timing.startDelay = 200.0;
     // --
 
     WebCompositorSupportMock mockCompositor;
 
     // Curve is created
     blink::WebFloatAnimationCurveMock* mockCurvePtr = new blink::WebFloatAnimationCurveMock;
     ExpectationSet usesMockCurve;
     EXPECT_CALL(mockCompositor, createFloatAnimationCurve())
         .WillOnce(Return(mockCurvePtr));
 
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(100.0, 2.0), blink::WebAnimationCurve::TimingFunctionTypeLinear));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(105.0, 5.0)));
+    usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0, 2.0), blink::WebAnimationCurve::TimingFunctionTypeLinear));
+    usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(5.0, 5.0)));
 
     // Create animation
     blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blink::WebAnimation::TargetPropertyOpacity);
     ExpectationSet usesMockAnimation;
 
     usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebAnimation::TargetPropertyOpacity, _))
         .WillOnce(Return(mockAnimationPtr));
 
     usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1));
+    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0));
     usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(false));
 
     EXPECT_CALL(*mockAnimationPtr, delete_())
         .Times(1)
         .After(usesMockAnimation);
     EXPECT_CALL(*mockCurvePtr, delete_())
         .Times(1)
         .After(usesMockCurve);
 
     // Go!
@@ skipping 32 matching lines @@
     usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.0, 5.0)));
 
     // Animation is created
     blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blink::WebAnimation::TargetPropertyOpacity);
     ExpectationSet usesMockAnimation;
 
     usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebAnimation::TargetPropertyOpacity, _))
         .WillOnce(Return(mockAnimationPtr));
 
     usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5));
+    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0));
     usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(true));
 
     EXPECT_CALL(*mockAnimationPtr, delete_())
         .Times(1)
         .After(usesMockAnimation);
     EXPECT_CALL(*mockCurvePtr, delete_())
         .Times(1)
         .After(usesMockCurve);
 
     // Go!
     setCompositorForTesting(mockCompositor);
     Vector<OwnPtr<blink::WebAnimation> > result;
     getCompositorAnimations(m_timing, *effect.get(), result);
     EXPECT_EQ(1U, result.size());
     result[0].clear();
 }
 
 TEST_F(CoreAnimationCompositorAnimationsTest, createSimpleOpacityAnimationNegativeStartDelay)
 {
     // Animation to convert
     RefPtr<KeyframeAnimationEffect> effect = createKeyframeAnimationEffect(
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(2.0).get(), 0),
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(5.0).get(), 1.0));
 
     m_timing.iterationCount = 5.0;
-    m_timing.iterationDuration = 2.0;
-    m_timing.startDelay = -3;
+    m_timing.iterationDuration = 1.75;
+    m_timing.startDelay = -3.25;
     // --
 
     WebCompositorSupportMock mockCompositor;
 
     // Curve is created
     blink::WebFloatAnimationCurveMock* mockCurvePtr = new blink::WebFloatAnimationCurveMock;
     ExpectationSet usesMockCurve;
     EXPECT_CALL(mockCompositor, createFloatAnimationCurve())
         .WillOnce(Return(mockCurvePtr));
 
     usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0, 2.0), blink::WebAnimationCurve::TimingFunctionTypeLinear));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(2.0, 5.0)));
+    usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.75, 5.0)));
 
     // Create animation
     blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blink::WebAnimation::TargetPropertyOpacity);
     ExpectationSet usesMockAnimation;
 
     usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebAnimation::TargetPropertyOpacity, _))
         .WillOnce(Return(mockAnimationPtr));
 
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(-1.0));
     usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(4));
+    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(-1.5));
     usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(false));
 
     EXPECT_CALL(*mockAnimationPtr, delete_())
         .Times(1)
         .After(usesMockAnimation);
     EXPECT_CALL(*mockCurvePtr, delete_())
         .Times(1)
         .After(usesMockCurve);
 
     // Go!
@@ skipping 38 matching lines @@
     usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.0, 5.0)));
 
     // Animation is created
     blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blink::WebAnimation::TargetPropertyOpacity);
     ExpectationSet usesMockAnimation;
 
     usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebAnimation::TargetPropertyOpacity, _))
         .WillOnce(Return(mockAnimationPtr));
 
     usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(10));
+    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0));
     usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(true));
 
     EXPECT_CALL(*mockAnimationPtr, delete_())
         .Times(1)
         .After(usesMockAnimation);
     EXPECT_CALL(*mockCurvePtr, delete_())
         .Times(1)
         .After(usesMockCurve);
 
     // Go!
@@ skipping 39 matching lines @@
     usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.0, 2.0)));
 
     // Create the animation
     blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blink::WebAnimation::TargetPropertyOpacity);
     ExpectationSet usesMockAnimation;
 
     usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebAnimation::TargetPropertyOpacity, _))
         .WillOnce(Return(mockAnimationPtr));
 
     usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(10));
+    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0));
     usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(true));
 
     EXPECT_CALL(*mockAnimationPtr, delete_())
         .Times(1)
         .After(usesMockAnimation);
     EXPECT_CALL(*mockCurvePtr, delete_())
         .Times(1)
         .After(usesMockCurve);
 
     // Go!
     setCompositorForTesting(mockCompositor);
     Vector<OwnPtr<blink::WebAnimation> > result;
     getCompositorAnimations(m_timing, *effect.get(), result);
     EXPECT_EQ(1U, result.size());
     result[0].clear();
 }
 
-TEST_F(CoreAnimationCompositorAnimationsTest, createReversedOpacityAnimationDurationPlaybackOffset)
+TEST_F(CoreAnimationCompositorAnimationsTest, createReversedOpacityAnimationNegativeStartDelay)
 {
     // Animation to convert
     RefPtr<KeyframeAnimationEffect> effect = createKeyframeAnimationEffect(
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(2.0).get(), 0),
         createReplaceOpKeyframe(CSSPropertyOpacity, AnimatableDouble::create(5.0).get(), 1.0));
 
-    m_timing.iterationDuration = 10.0;
-    m_timing.playbackRate = 2.0;
-    m_timing.startDelay = 200.0;
-    m_timing.direction = Timing::PlaybackDirectionReverse;
+    m_timing.iterationCount = 5.0;
+    m_timing.iterationDuration = 2.0;
+    m_timing.startDelay = -3;
+    m_timing.direction = Timing::PlaybackDirectionAlternateReverse;
     // --
 
     WebCompositorSupportMock mockCompositor;
 
     // Curve is created
     blink::WebFloatAnimationCurveMock* mockCurvePtr = new blink::WebFloatAnimationCurveMock;
     ExpectationSet usesMockCurve;
     EXPECT_CALL(mockCompositor, createFloatAnimationCurve())
         .WillOnce(Return(mockCurvePtr));
 
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(100.0, 5.0), blink::WebAnimationCurve::TimingFunctionTypeLinear));
-    usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(105.0, 2.0)));
+    usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0, 2.0), blink::WebAnimationCurve::TimingFunctionTypeLinear));
+    usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(2.0, 5.0)));
 
     // Create animation
     blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blink::WebAnimation::TargetPropertyOpacity);
     ExpectationSet usesMockAnimation;
 
     usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), blink::WebAnimation::TargetPropertyOpacity, _))
         .WillOnce(Return(mockAnimationPtr));
 
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1));
-    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(false));
+    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(4));
+    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(-1.0));
+    usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(true));
 
     EXPECT_CALL(*mockAnimationPtr, delete_())
         .Times(1)
         .After(usesMockAnimation);
     EXPECT_CALL(*mockCurvePtr, delete_())
         .Times(1)
         .After(usesMockCurve);
 
     // Go!
     setCompositorForTesting(mockCompositor);
     Vector<OwnPtr<blink::WebAnimation> > result;
     getCompositorAnimations(m_timing, *effect.get(), result);
     EXPECT_EQ(1U, result.size());
     result[0].clear();
 }
 
+
 } // namespace WebCore