| Index: Source/core/animation/AnimationTest.cpp
|
| diff --git a/Source/core/animation/AnimationTest.cpp b/Source/core/animation/AnimationTest.cpp
|
| index 8e43eb5f11942ae99afa0b146f9c8bfe7bbf59c7..46ab00492e946bc37fc11b07115cddfe50027c4e 100644
|
| --- a/Source/core/animation/AnimationTest.cpp
|
| +++ b/Source/core/animation/AnimationTest.cpp
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "bindings/core/v8/Dictionary.h"
|
| #include "bindings/core/v8/UnionTypesCore.h"
|
| +#include "bindings/core/v8/V8AnimationTimingProperties.h"
|
| #include "core/animation/AnimationClock.h"
|
| #include "core/animation/AnimationNodeTiming.h"
|
| #include "core/animation/AnimationTestHelper.h"
|
| @@ -49,11 +50,11 @@ protected:
|
| template<typename T>
|
| static PassRefPtrWillBeRawPtr<Animation> createAnimation(Element* element, Vector<Dictionary> keyframeDictionaryVector, T timingInput, ExceptionState& exceptionState)
|
| {
|
| - return Animation::create(element, EffectInput::convert(element, keyframeDictionaryVector, exceptionState), timingInput);
|
| + return Animation::create(element, keyframeDictionaryVector, timingInput, exceptionState);
|
| }
|
| static PassRefPtrWillBeRawPtr<Animation> createAnimation(Element* element, Vector<Dictionary> keyframeDictionaryVector, ExceptionState& exceptionState)
|
| {
|
| - return Animation::create(element, EffectInput::convert(element, keyframeDictionaryVector, exceptionState));
|
| + return Animation::create(element, keyframeDictionaryVector, exceptionState);
|
| }
|
|
|
| v8::Isolate* m_isolate;
|
| @@ -228,7 +229,8 @@ TEST_F(AnimationAnimationV8Test, SpecifiedGetters)
|
| setV8ObjectPropertyAsNumber(timingInput, "playbackRate", 2);
|
| setV8ObjectPropertyAsString(timingInput, "direction", "reverse");
|
| setV8ObjectPropertyAsString(timingInput, "easing", "step-start");
|
| - Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), m_isolate, exceptionState);
|
| + AnimationTimingProperties timingInputDictionary;
|
| + V8AnimationTimingProperties::toImpl(m_isolate, timingInput, timingInputDictionary, exceptionState);
|
|
|
| RefPtrWillBeRawPtr<Animation> animation = createAnimation(element.get(), jsKeyframes, timingInputDictionary, exceptionState);
|
|
|
| @@ -249,7 +251,8 @@ TEST_F(AnimationAnimationV8Test, SpecifiedDurationGetter)
|
|
|
| v8::Handle<v8::Object> timingInputWithDuration = v8::Object::New(m_isolate);
|
| setV8ObjectPropertyAsNumber(timingInputWithDuration, "duration", 2.5);
|
| - Dictionary timingInputDictionaryWithDuration = Dictionary(v8::Handle<v8::Value>::Cast(timingInputWithDuration), m_isolate, exceptionState);
|
| + AnimationTimingProperties timingInputDictionaryWithDuration;
|
| + V8AnimationTimingProperties::toImpl(m_isolate, timingInputWithDuration, timingInputDictionaryWithDuration, exceptionState);
|
|
|
| RefPtrWillBeRawPtr<Animation> animationWithDuration = createAnimation(element.get(), jsKeyframes, timingInputDictionaryWithDuration, exceptionState);
|
|
|
| @@ -262,7 +265,8 @@ TEST_F(AnimationAnimationV8Test, SpecifiedDurationGetter)
|
|
|
|
|
| v8::Handle<v8::Object> timingInputNoDuration = v8::Object::New(m_isolate);
|
| - Dictionary timingInputDictionaryNoDuration = Dictionary(v8::Handle<v8::Value>::Cast(timingInputNoDuration), m_isolate, exceptionState);
|
| + AnimationTimingProperties timingInputDictionaryNoDuration;
|
| + V8AnimationTimingProperties::toImpl(m_isolate, timingInputNoDuration, timingInputDictionaryNoDuration, exceptionState);
|
|
|
| RefPtrWillBeRawPtr<Animation> animationNoDuration = createAnimation(element.get(), jsKeyframes, timingInputDictionaryNoDuration, exceptionState);
|
|
|
| @@ -278,7 +282,8 @@ TEST_F(AnimationAnimationV8Test, SpecifiedSetters)
|
| {
|
| Vector<Dictionary, 0> jsKeyframes;
|
| v8::Handle<v8::Object> timingInput = v8::Object::New(m_isolate);
|
| - Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), m_isolate, exceptionState);
|
| + AnimationTimingProperties timingInputDictionary;
|
| + V8AnimationTimingProperties::toImpl(m_isolate, timingInput, timingInputDictionary, exceptionState);
|
| RefPtrWillBeRawPtr<Animation> animation = createAnimation(element.get(), jsKeyframes, timingInputDictionary, exceptionState);
|
|
|
| RefPtrWillBeRawPtr<AnimationNodeTiming> specified = animation->timing();
|
| @@ -320,7 +325,8 @@ TEST_F(AnimationAnimationV8Test, SetSpecifiedDuration)
|
| {
|
| Vector<Dictionary, 0> jsKeyframes;
|
| v8::Handle<v8::Object> timingInput = v8::Object::New(m_isolate);
|
| - Dictionary timingInputDictionary = Dictionary(v8::Handle<v8::Value>::Cast(timingInput), m_isolate, exceptionState);
|
| + AnimationTimingProperties timingInputDictionary;
|
| + V8AnimationTimingProperties::toImpl(m_isolate, timingInput, timingInputDictionary, exceptionState);
|
| RefPtrWillBeRawPtr<Animation> animation = createAnimation(element.get(), jsKeyframes, timingInputDictionary, exceptionState);
|
|
|
| RefPtrWillBeRawPtr<AnimationNodeTiming> specified = animation->timing();
|
|
|