Web Animations API: Start implementation of timing input objects.

Source/core/animation/ElementAnimationTest.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 58 matching lines @@
         ASSERT_EQ(0, document->timeline()->currentTime());
     }
 
     RefPtr<Document> document;
     RefPtr<Element> element;
 
     void startAnimation(Element* element, Vector<Dictionary> keyframesDictionaryVector)
     {
         ElementAnimation::startAnimation(element, keyframesDictionaryVector);
     }
-
-    void startAnimationWithSpecifiedDuration(Element* element, Vector<Dictionary> keyframesDictionaryVector, double duration)
+    void startAnimation(Element* element, Vector<Dictionary> keyframesDictionaryVector, v8::Handle<v8::Value> timingInput)
     {
-        ElementAnimation::startAnimation(element, keyframesDictionaryVector, duration);
+        ElementAnimation::startAnimation(element, keyframesDictionaryVector, timingInput);
     }
 };
 
 TEST_F(AnimationElementAnimationTest, CanStartAnAnimation)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope scope(isolate);
     v8::Local<v8::Context> context = v8::Context::New(isolate);
     v8::Context::Scope contextScope(context);
 
@@ skipping 10 matching lines @@
     jsKeyframes.append(Dictionary(keyframe2, isolate));
 
     String value1;
     ASSERT_TRUE(jsKeyframes[0].get("width", value1));
     ASSERT_EQ("100px", value1);
 
     String value2;
     ASSERT_TRUE(jsKeyframes[1].get("width", value2));
     ASSERT_EQ("0px", value2);
 
-    startAnimationWithSpecifiedDuration(element.get(), jsKeyframes, 0);
+    v8::Handle<v8::Value> durationValue = v8::Handle<v8::Value>::Cast(v8::Number::New(isolate, 0));
+    startAnimation(element.get(), jsKeyframes, durationValue);
 
     Player* player = document->timeline()->players().at(0).get();
 
     Animation* animation = toAnimation(player->source());
 
     Element* target = animation->target();
     EXPECT_EQ(*element.get(), *target);
 
     const KeyframeEffectModel::KeyframeVector keyframes =
         toKeyframeEffectModel(animation->effect())->getFrames();
@@ skipping 26 matching lines @@
 }
 
 TEST_F(AnimationElementAnimationTest, CanSetDuration)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope scope(isolate);
     v8::Local<v8::Context> context = v8::Context::New(isolate);
     v8::Context::Scope contextScope(context);
 
     Vector<Dictionary, 0> jsKeyframes;
+
     double duration = 2;
-
-    startAnimationWithSpecifiedDuration(element.get(), jsKeyframes, duration);
+    v8::Handle<v8::Value> durationValue = v8::Handle<v8::Value>::Cast(v8::Number::New(isolate, duration));
+    startAnimation(element.get(), jsKeyframes, durationValue);
 
     Player* player = document->timeline()->players().at(0).get();
 
     EXPECT_TRUE(player->source()->specified().hasIterationDuration);
     EXPECT_EQ(duration, player->source()->specified().iterationDuration);
 }
 
 TEST_F(AnimationElementAnimationTest, CanOmitSpecifiedDuration)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope scope(isolate);
     v8::Local<v8::Context> context = v8::Context::New(isolate);
     v8::Context::Scope contextScope(context);
 
     Vector<Dictionary, 0> jsKeyframes;
 
     startAnimation(element.get(), jsKeyframes);
 
     Player* player = document->timeline()->players().at(0).get();
 
-    // FIXME: This is correct for the moment, as using c++ default arguments means
-    // there is no way to tell whether a duration has been specified by the user.
-    // Once we implment timing object arguments we should be able to tell, and this
-    // check should be changed to EXPECT_FALSE.
-    EXPECT_TRUE(player->source()->specified().hasIterationDuration);
+    EXPECT_FALSE(player->source()->specified().hasIterationDuration);
     EXPECT_EQ(0, player->source()->specified().iterationDuration);
 }
 
 TEST_F(AnimationElementAnimationTest, ClipNegativeDurationToZero)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope scope(isolate);
     v8::Local<v8::Context> context = v8::Context::New(isolate);
     v8::Context::Scope contextScope(context);
 
     Vector<Dictionary, 0> jsKeyframes;
-    double duration = -2;
 
-    startAnimationWithSpecifiedDuration(element.get(), jsKeyframes, duration);
+    v8::Handle<v8::Value> durationValue = v8::Handle<v8::Value>::Cast(v8::Number::New(isolate, -2));
+    startAnimation(element.get(), jsKeyframes, durationValue);
 
     Player* player = document->timeline()->players().at(0).get();
 
     EXPECT_TRUE(player->source()->specified().hasIterationDuration);
     EXPECT_EQ(0, player->source()->specified().iterationDuration);
 }
 
 } // namespace WebCore