Web Animations API: Implement step-middle and steps(x, middle) timing functions.

Source/core/animation/AnimationTest.cpp

Index: Source/core/animation/AnimationTest.cpp
diff --git a/Source/core/animation/AnimationTest.cpp b/Source/core/animation/AnimationTest.cpp
index 9ea0e3f899119e1e1bd90866d67ac27c9287d146..2f87d3f4863e55bec15426c247b49e99c36edf57 100644
--- a/Source/core/animation/AnimationTest.cpp
+++ b/Source/core/animation/AnimationTest.cpp
@@ -645,71 +645,74 @@ TEST_F(AnimationAnimationTest, TimingInputTimingFunction)
 
     Timing timing;
     const RefPtr<TimingFunction> defaultTimingFunction = LinearTimingFunction::create();
-    EXPECT_EQ(*defaultTimingFunction.get(), *timing.timingFunction.get());
+    EXPECT_EQ(*defaultTimingFunction, *timing.timingFunction);
 
     applyTimingInputString(timing, isolate, "easing", "ease");
-    EXPECT_EQ(*(CubicBezierTimingFunction::preset(CubicBezierTimingFunction::Ease)), *timing.timingFunction.get());
+    EXPECT_EQ(*(CubicBezierTimingFunction::preset(CubicBezierTimingFunction::Ease)), *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
     applyTimingInputString(timing, isolate, "easing", "ease-in");
-    EXPECT_EQ(*(CubicBezierTimingFunction::preset(CubicBezierTimingFunction::EaseIn)), *timing.timingFunction.get());
+    EXPECT_EQ(*(CubicBezierTimingFunction::preset(CubicBezierTimingFunction::EaseIn)), *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
     applyTimingInputString(timing, isolate, "easing", "ease-out");
-    EXPECT_EQ(*(CubicBezierTimingFunction::preset(CubicBezierTimingFunction::EaseOut)), *timing.timingFunction.get());
+    EXPECT_EQ(*(CubicBezierTimingFunction::preset(CubicBezierTimingFunction::EaseOut)), *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
     applyTimingInputString(timing, isolate, "easing", "ease-in-out");
-    EXPECT_EQ(*(CubicBezierTimingFunction::preset(CubicBezierTimingFunction::EaseInOut)), *timing.timingFunction.get());
+    EXPECT_EQ(*(CubicBezierTimingFunction::preset(CubicBezierTimingFunction::EaseInOut)), *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
     applyTimingInputString(timing, isolate, "easing", "linear");
-    EXPECT_EQ(*(LinearTimingFunction::create()), *timing.timingFunction.get());
+    EXPECT_EQ(*(LinearTimingFunction::create()), *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
     applyTimingInputString(timing, isolate, "easing", "initial");
-    EXPECT_EQ(*defaultTimingFunction.get(), *timing.timingFunction.get());
+    EXPECT_EQ(*defaultTimingFunction, *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
     applyTimingInputString(timing, isolate, "easing", "step-start");
-    EXPECT_EQ(*(StepsTimingFunction::preset(StepsTimingFunction::Start)), *timing.timingFunction.get());
+    EXPECT_EQ(*(StepsTimingFunction::preset(StepsTimingFunction::Start)), *timing.timingFunction);
+    timing.timingFunction = defaultTimingFunction;
+
+    applyTimingInputString(timing, isolate, "easing", "step-middle");
+    EXPECT_EQ(*(StepsTimingFunction::preset(StepsTimingFunction::Middle)), *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
     applyTimingInputString(timing, isolate, "easing", "step-end");
-    EXPECT_EQ(*(StepsTimingFunction::preset(StepsTimingFunction::End)), *timing.timingFunction.get());
+    EXPECT_EQ(*(StepsTimingFunction::preset(StepsTimingFunction::End)), *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
     applyTimingInputString(timing, isolate, "easing", "cubic-bezier(1, 1, 0.3, 0.3)");
-    EXPECT_EQ(*(CubicBezierTimingFunction::create(1, 1, 0.3, 0.3).get()), *timing.timingFunction.get());
+    EXPECT_EQ(*CubicBezierTimingFunction::create(1, 1, 0.3, 0.3), *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
     applyTimingInputString(timing, isolate, "easing", "steps(3, start)");
-    EXPECT_EQ(*(StepsTimingFunction::create(3, true).get()), *timing.timingFunction.get());
+    EXPECT_EQ(*(StepsTimingFunction::create(3, StepsTimingFunction::StepAtStart)), *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
-    applyTimingInputString(timing, isolate, "easing", "steps(5, end)");
-    EXPECT_EQ(*(StepsTimingFunction::create(5, false).get()), *timing.timingFunction.get());
+    applyTimingInputString(timing, isolate, "easing", "steps(5, middle)");
+    EXPECT_EQ(*(StepsTimingFunction::create(5, StepsTimingFunction::StepAtMiddle)), *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
-    applyTimingInputString(timing, isolate, "easing", "steps(5.6, end)");
-    EXPECT_EQ(*defaultTimingFunction.get(), *timing.timingFunction.get());
+    applyTimingInputString(timing, isolate, "easing", "steps(5, end)");
+    EXPECT_EQ(*(StepsTimingFunction::create(5, StepsTimingFunction::StepAtEnd)), *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
-    // FIXME: Step-middle not yet implemented. Change this test when it is working.
-    applyTimingInputString(timing, isolate, "easing", "steps(5, middle)");
-    EXPECT_EQ(*defaultTimingFunction.get(), *timing.timingFunction.get());
+    applyTimingInputString(timing, isolate, "easing", "steps(5.6, end)");
+    EXPECT_EQ(*defaultTimingFunction, *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
     applyTimingInputString(timing, isolate, "easing", "cubic-bezier(2, 2, 0.3, 0.3)");
-    EXPECT_EQ(*defaultTimingFunction.get(), *timing.timingFunction.get());
+    EXPECT_EQ(*defaultTimingFunction, *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
     applyTimingInputString(timing, isolate, "easing", "rubbish");
-    EXPECT_EQ(*defaultTimingFunction.get(), *timing.timingFunction.get());
+    EXPECT_EQ(*defaultTimingFunction, *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
     applyTimingInputNumber(timing, isolate, "easing", 2);
-    EXPECT_EQ(*defaultTimingFunction.get(), *timing.timingFunction.get());
+    EXPECT_EQ(*defaultTimingFunction, *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 }
 
@@ -734,7 +737,7 @@ TEST_F(AnimationAnimationTest, TimingInputEmpty)
     EXPECT_TRUE(std::isnan(updatedTiming.iterationDuration));
     EXPECT_EQ(controlTiming.playbackRate, updatedTiming.playbackRate);
     EXPECT_EQ(controlTiming.direction, updatedTiming.direction);
-    EXPECT_EQ(*controlTiming.timingFunction.get(), *updatedTiming.timingFunction.get());
+    EXPECT_EQ(*controlTiming.timingFunction, *updatedTiming.timingFunction);
 }
 
 TEST_F(AnimationAnimationTest, TimeToEffectChange)