Add AnimationTimingProperties dictionary

Source/core/animation/ElementAnimation.h

 /*
  * 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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ElementAnimation_h
 #define ElementAnimation_h
 
+#include "bindings/core/v8/UnionTypesCore.h"
 #include "core/animation/ActiveAnimations.h"
 #include "core/animation/Animation.h"
 #include "core/animation/AnimationTimeline.h"
 #include "core/animation/EffectInput.h"
 #include "core/animation/TimingInput.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "platform/RuntimeEnabledFeatures.h"
 
 
 namespace blink {
 
 class Dictionary;
 
 class ElementAnimation {
 public:
-    static AnimationPlayer* animate(Element& element, PassRefPtrWillBeRawPtr<AnimationEffect> effect, const Dictionary& timingInputDictionary)
+    static AnimationPlayer* animate(Element& element, const AnimationEffectOrDictionarySequence& effectInput, double duration, ExceptionState& exceptionState)
     {
-        return animateInternal(element, effect, TimingInput::convert(timingInputDictionary));
-    }
-
-    static AnimationPlayer* animate(Element& element, PassRefPtrWillBeRawPtr<AnimationEffect> effect, double duration)
-    {
+        RefPtrWillBeRawPtr<AnimationEffect> effect = EffectInput::convert(&element, effectInput, exceptionState);
+        if (exceptionState.hadException())
+            return 0;
         return animateInternal(element, effect, TimingInput::convert(duration));
     }
 
-    static AnimationPlayer* animate(Element& element, PassRefPtrWillBeRawPtr<AnimationEffect> effect)
+    static AnimationPlayer* animate(Element& element, const AnimationEffectOrDictionarySequence& effectInput, const AnimationTimingProperties& timingInput, ExceptionState& exceptionState)
     {
+        RefPtrWillBeRawPtr<AnimationEffect> effect = EffectInput::convert(&element, effectInput, exceptionState);
+        if (exceptionState.hadException())
+            return 0;
+        return animateInternal(element, effect, TimingInput::convert(timingInput));
+    }
+
+    static AnimationPlayer* animate(Element& element, const AnimationEffectOrDictionarySequence& effectInput, ExceptionState& exceptionState)
+    {
+        RefPtrWillBeRawPtr<AnimationEffect> effect = EffectInput::convert(&element, effectInput, exceptionState);
+        if (exceptionState.hadException())
+            return 0;
         return animateInternal(element, effect, Timing());
     }
 
-    static AnimationPlayer* animate(Element& element, const Vector<Dictionary>& keyframeDictionaryVector, const Dictionary& timingInputDictionary, ExceptionState& exceptionState)
-    {
-        RefPtrWillBeRawPtr<AnimationEffect> effect = EffectInput::convert(&element, keyframeDictionaryVector, exceptionState);
-        if (exceptionState.hadException())
-            return 0;
-        ASSERT(effect);
-        return animateInternal(element, effect.release(), TimingInput::convert(timingInputDictionary));
-    }
-
-    static AnimationPlayer* animate(Element& element, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState& exceptionState)
-    {
-        RefPtrWillBeRawPtr<AnimationEffect> effect = EffectInput::convert(&element, keyframeDictionaryVector, exceptionState);
-        if (exceptionState.hadException())
-            return 0;
-        ASSERT(effect);
-        return animateInternal(element, effect.release(), TimingInput::convert(duration));
-    }
-
-    static AnimationPlayer* animate(Element& element, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionState)
-    {
-        RefPtrWillBeRawPtr<AnimationEffect> effect = EffectInput::convert(&element, keyframeDictionaryVector, exceptionState);
-        if (exceptionState.hadException())
-            return 0;
-        ASSERT(effect);
-        return animateInternal(element, effect.release(), Timing());
-    }
-
     static WillBeHeapVector<RefPtrWillBeMember<AnimationPlayer> > getAnimationPlayers(Element& element)
     {
         WillBeHeapVector<RefPtrWillBeMember<AnimationPlayer> > animationPlayers;
 
         if (!element.hasActiveAnimations())
             return animationPlayers;
 
         for (const auto& player : element.document().timeline().getAnimationPlayers()) {
             ASSERT(player->source());
             if (toAnimation(player->source())->target() == element && (player->source()->isCurrent() || player->source()->isInEffect()))
                 animationPlayers.append(player);
         }
         return animationPlayers;
     }
 
 private:
     static AnimationPlayer* animateInternal(Element& element, PassRefPtrWillBeRawPtr<AnimationEffect> effect, const Timing& timing)
     {
         RefPtrWillBeRawPtr<Animation> animation = Animation::create(&element, effect, timing);
         return element.document().timeline().play(animation.get());
     }
 };
 
 } // namespace blink
 
 #endif // ElementAnimation_h