Web Animations API: Refactor IDL input conversion out of Animation

Source/core/animation/TimingInputTest.cpp

Index: Source/core/animation/TimingInputTest.cpp
diff --git a/Source/core/animation/AnimationTimingInputTest.cpp b/Source/core/animation/TimingInputTest.cpp
similarity index 87%
rename from Source/core/animation/AnimationTimingInputTest.cpp
rename to Source/core/animation/TimingInputTest.cpp
index 3d7861d415e077fb33aca7ed0165397b860de233..ee47b8f4f2d32da814dc6064f8892df8bc0c8d2d 100644
--- a/Source/core/animation/AnimationTimingInputTest.cpp
+++ b/Source/core/animation/TimingInputTest.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "config.h"
-#include "core/animation/Animation.h"
+#include "core/animation/Timing.h"
 
 #include "bindings/v8/Dictionary.h"
 #include "core/animation/AnimationTestHelper.h"
@@ -14,9 +14,9 @@
 
 namespace WebCore {
 
-class AnimationAnimationTimingInputTest : public ::testing::Test {
+class AnimationTimingInputTest : public ::testing::Test {
 protected:
-    AnimationAnimationTimingInputTest()
+    AnimationTimingInputTest()
         : isolate(v8::Isolate::GetCurrent())
         , scope(isolate)
         , context(v8::Context::New(isolate))
@@ -29,19 +29,12 @@ protected:
     v8::Local<v8::Context> context;
     v8::Context::Scope contextScope;
 
-    void populateTiming(Timing& timing, Dictionary timingInputDictionary)
-    {
-        Animation::populateTiming(timing, timingInputDictionary);
-    }
-
     Timing applyTimingInputNumber(String timingProperty, double timingPropertyValue)
     {
         v8::Handle<v8::Object> timingInput = v8::Object::New(isolate);
         setV8ObjectPropertyAsNumber(timingInput, timingProperty, timingPropertyValue);
         Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), isolate);
-        Timing timing;
-        populateTiming(timing, timingInputDictionary);
-        return timing;
+        return Timing::convertInput(timingInputDictionary);
     }
 
     Timing applyTimingInputString(String timingProperty, String timingPropertyValue)
@@ -49,13 +42,11 @@ protected:
         v8::Handle<v8::Object> timingInput = v8::Object::New(isolate);
         setV8ObjectPropertyAsString(timingInput, timingProperty, timingPropertyValue);
         Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), isolate);
-        Timing timing;
-        populateTiming(timing, timingInputDictionary);
-        return timing;
+        return Timing::convertInput(timingInputDictionary);
     }
 };
 
-TEST_F(AnimationAnimationTimingInputTest, TimingInputStartDelay)
+TEST_F(AnimationTimingInputTest, TimingInputStartDelay)
 {
     EXPECT_EQ(1.1, applyTimingInputNumber("delay", 1.1).startDelay);
     EXPECT_EQ(-1, applyTimingInputNumber("delay", -1).startDelay);
@@ -67,13 +58,13 @@ TEST_F(AnimationAnimationTimingInputTest, TimingInputStartDelay)
     EXPECT_EQ(0, applyTimingInputString("delay", "rubbish").startDelay);
 }
 
-TEST_F(AnimationAnimationTimingInputTest, TimingInputEndDelay)
+TEST_F(AnimationTimingInputTest, TimingInputEndDelay)
 {
     EXPECT_EQ(10, applyTimingInputNumber("endDelay", 10).endDelay);
     EXPECT_EQ(-2.5, applyTimingInputNumber("endDelay", -2.5).endDelay);
 }
 
-TEST_F(AnimationAnimationTimingInputTest, TimingInputFillMode)
+TEST_F(AnimationTimingInputTest, TimingInputFillMode)
 {
     Timing::FillMode defaultFillMode = Timing::FillModeAuto;
 
@@ -87,7 +78,7 @@ TEST_F(AnimationAnimationTimingInputTest, TimingInputFillMode)
     EXPECT_EQ(defaultFillMode, applyTimingInputNumber("fill", 2).fillMode);
 }
 
-TEST_F(AnimationAnimationTimingInputTest, TimingInputIterationStart)
+TEST_F(AnimationTimingInputTest, TimingInputIterationStart)
 {
     EXPECT_EQ(1.1, applyTimingInputNumber("iterationStart", 1.1).iterationStart);
     EXPECT_EQ(0, applyTimingInputNumber("iterationStart", -1).iterationStart);
@@ -97,7 +88,7 @@ TEST_F(AnimationAnimationTimingInputTest, TimingInputIterationStart)
     EXPECT_EQ(0, applyTimingInputString("iterationStart", "rubbish").iterationStart);
 }
 
-TEST_F(AnimationAnimationTimingInputTest, TimingInputIterationCount)
+TEST_F(AnimationTimingInputTest, TimingInputIterationCount)
 {
     EXPECT_EQ(2.1, applyTimingInputNumber("iterations", 2.1).iterationCount);
     EXPECT_EQ(0, applyTimingInputNumber("iterations", -1).iterationCount);
@@ -111,7 +102,7 @@ TEST_F(AnimationAnimationTimingInputTest, TimingInputIterationCount)
     EXPECT_EQ(1, applyTimingInputString("iterations", "rubbish").iterationCount);
 }
 
-TEST_F(AnimationAnimationTimingInputTest, TimingInputIterationDuration)
+TEST_F(AnimationTimingInputTest, TimingInputIterationDuration)
 {
     EXPECT_EQ(1.1, applyTimingInputNumber("duration", 1.1).iterationDuration);
     EXPECT_TRUE(std::isnan(applyTimingInputNumber("duration", -1).iterationDuration));
@@ -127,7 +118,7 @@ TEST_F(AnimationAnimationTimingInputTest, TimingInputIterationDuration)
     EXPECT_TRUE(std::isnan(applyTimingInputString("duration", "rubbish").iterationDuration));
 }
 
-TEST_F(AnimationAnimationTimingInputTest, TimingInputPlaybackRate)
+TEST_F(AnimationTimingInputTest, TimingInputPlaybackRate)
 {
     EXPECT_EQ(2.1, applyTimingInputNumber("playbackRate", 2.1).playbackRate);
     EXPECT_EQ(-1, applyTimingInputNumber("playbackRate", -1).playbackRate);
@@ -137,7 +128,7 @@ TEST_F(AnimationAnimationTimingInputTest, TimingInputPlaybackRate)
     EXPECT_EQ(1, applyTimingInputString("playbackRate", "rubbish").playbackRate);
 }
 
-TEST_F(AnimationAnimationTimingInputTest, TimingInputDirection)
+TEST_F(AnimationTimingInputTest, TimingInputDirection)
 {
     Timing::PlaybackDirection defaultPlaybackDirection = Timing::PlaybackDirectionNormal;
 
@@ -149,7 +140,7 @@ TEST_F(AnimationAnimationTimingInputTest, TimingInputDirection)
     EXPECT_EQ(defaultPlaybackDirection, applyTimingInputNumber("direction", 2).direction);
 }
 
-TEST_F(AnimationAnimationTimingInputTest, TimingInputTimingFunction)
+TEST_F(AnimationTimingInputTest, TimingInputTimingFunction)
 {
     const RefPtr<TimingFunction> defaultTimingFunction = LinearTimingFunction::create();
 
@@ -172,14 +163,13 @@ TEST_F(AnimationAnimationTimingInputTest, TimingInputTimingFunction)
     EXPECT_EQ(*defaultTimingFunction, *applyTimingInputNumber("easing", 2).timingFunction);
 }
 
-TEST_F(AnimationAnimationTimingInputTest, TimingInputEmpty)
+TEST_F(AnimationTimingInputTest, TimingInputEmpty)
 {
-    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);
+    Timing updatedTiming = Timing::convertInput(timingInputDictionary);
 
     EXPECT_EQ(controlTiming.startDelay, updatedTiming.startDelay);
     EXPECT_EQ(controlTiming.fillMode, updatedTiming.fillMode);