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

Source/core/animation/AnimationTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/animation/Animation.h"
 
 #include "bindings/v8/Dictionary.h"
 #include "core/animation/AnimatableLength.h"
 #include "core/animation/AnimationClock.h"
@@ skipping 627 matching lines @@
 
 TEST_F(AnimationAnimationTest, TimingInputTimingFunction)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope scope(isolate);
     v8::Local<v8::Context> context = v8::Context::New(isolate);
     v8::Context::Scope contextScope(context);
 
     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, middle)");
+    EXPECT_EQ(*(StepsTimingFunction::create(5, StepsTimingFunction::StepAtMiddle)), *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
     applyTimingInputString(timing, isolate, "easing", "steps(5, end)");
-    EXPECT_EQ(*(StepsTimingFunction::create(5, false).get()), *timing.timingFunction.get());
+    EXPECT_EQ(*(StepsTimingFunction::create(5, StepsTimingFunction::StepAtEnd)), *timing.timingFunction);
     timing.timingFunction = defaultTimingFunction;
 
     applyTimingInputString(timing, isolate, "easing", "steps(5.6, end)");
-    EXPECT_EQ(*defaultTimingFunction.get(), *timing.timingFunction.get());
-    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());
+    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;
 }
 
 TEST_F(AnimationAnimationTest, TimingInputEmpty)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope scope(isolate);
     v8::Local<v8::Context> context = v8::Context::New(isolate);
     v8::Context::Scope contextScope(context);
 
     Timing updatedTiming;
     Timing controlTiming;
 
     v8::Handle<v8::Object> timingInput = v8::Object::New(isolate);
     Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), isolate);
     populateTiming(updatedTiming, timingInputDictionary);
 
     EXPECT_EQ(controlTiming.startDelay, updatedTiming.startDelay);
     EXPECT_EQ(controlTiming.fillMode, updatedTiming.fillMode);
     EXPECT_EQ(controlTiming.iterationStart, updatedTiming.iterationStart);
     EXPECT_EQ(controlTiming.iterationCount, updatedTiming.iterationCount);
     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)
 {
     Timing timing;
     timing.iterationDuration = 100;
     timing.startDelay = 100;
     timing.endDelay = 100;
     timing.fillMode = Timing::FillModeNone;
     RefPtr<Animation> animation = Animation::create(0, 0, timing);
@@ skipping 80 matching lines @@
     player->setCurrentTime(150);
     EXPECT_EQ(inf, animation->timeToForwardsEffectChange());
     EXPECT_EQ(0, animation->timeToReverseEffectChange());
 
     player->setCurrentTime(200);
     EXPECT_EQ(inf, animation->timeToForwardsEffectChange());
     EXPECT_EQ(50, animation->timeToReverseEffectChange());
 }
 
 } // namespace WebCore