Web Animations API: Refactor IDL input conversion out of Animation

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 "wtf/Vector.h"
+#include "RuntimeEnabledFeatures.h"
+#include "core/animation/Animation.h"
+#include "core/animation/DocumentTimeline.h"
+#include "core/animation/EffectInput.h"
+#include "core/animation/TimingInput.h"
+#include "core/dom/Element.h"
 
 namespace WebCore {
 
-class Animation;
 class Dictionary;
-class Element;
 
 class ElementAnimation {
 public:
-    static Animation* animate(Element&, Vector<Dictionary> keyframesDictionaryVector, Dictionary timingInput);
-    static Animation* animate(Element&, Vector<Dictionary> keyframesDictionaryVector, double timingInput);
-    static Animation* animate(Element&, Vector<Dictionary> keyframesDictionaryVector);
+    static Animation* animate(Element& element, PassRefPtrWillBeRawPtr<AnimationEffect> effect, const Dictionary& timingInputDictionary)
+    {
+        return animateImpl(element, effect, TimingInput::convert(timingInputDictionary));
+    }
+
+    static Animation* animate(Element& element, PassRefPtrWillBeRawPtr<AnimationEffect> effect, double duration)
+    {
+        return animateImpl(element, effect, TimingInput::convert(duration));
+    }
+
+    static Animation* animate(Element& element, PassRefPtrWillBeRawPtr<AnimationEffect> effect)
+    {
+        return animateImpl(element, effect, TimingInput::convert());
+    }
+
+    static Animation* animate(Element& element, Vector<Dictionary> keyframeDictionaryVector, const Dictionary& timingInputDictionary)
+    {
+        return animateImpl(element, EffectInput::convert(&element, keyframeDictionaryVector), TimingInput::convert(timingInputDictionary));
+    }
+
+    static Animation* animate(Element& element, Vector<Dictionary> keyframeDictionaryVector, double duration)
+    {
+        return animateImpl(element, EffectInput::convert(&element, keyframeDictionaryVector), TimingInput::convert(duration));
+    }
+
+    static Animation* animate(Element& element, Vector<Dictionary> keyframeDictionaryVector)
+    {
+        return animateImpl(element, EffectInput::convert(&element, keyframeDictionaryVector), TimingInput::convert());
+    }
+
+private:
+    static Animation* animateImpl(Element& element, PassRefPtrWillBeRawPtr<AnimationEffect> effect, Timing timing)

[esprehn, 2014/03/04 00:59:42]

animateInternal?

[alancutter (OOO until 2018), 2014/03/04 01:21:41]

Done.

+    {
+        ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled());
+        RefPtr<Animation> animation = Animation::create(&element, effect, timing);
+        element.document().timeline().play(animation.get());
+        return animation.get();
+    }
 };
 
 } // namespace WebCore
 
 #endif // ElementAnimation_h