Index: Source/core/animation/ElementAnimation.h |
diff --git a/Source/core/animation/ElementAnimation.h b/Source/core/animation/ElementAnimation.h |
index 6818a24de0a358aebe66f24fa5195b12c8c975ca..20ba3d025929a497a3cc7d477a251f0b92e32468 100644 |
--- a/Source/core/animation/ElementAnimation.h |
+++ b/Source/core/animation/ElementAnimation.h |
@@ -31,22 +31,27 @@ |
#ifndef ElementAnimation_h |
#define ElementAnimation_h |
-#include "CSSPropertyNames.h" // For CSSPropertyID. |
+#include "core/css/parser/BisonCSSParser.h" |
namespace WebCore { |
class Animation; |
class Dictionary; |
class Element; |
+struct Timing; |
class ElementAnimation { |
public: |
static CSSPropertyID camelCaseCSSPropertyNameToID(const String& propertyName); |
- static Animation* animate(Element*, Vector<Dictionary> keyframesDictionaryVector, double duration = 0); |
+ 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); |
private: |
- static Animation* startAnimation(Element*, Vector<Dictionary> keyframesDictionaryVector, double duration = 0); |
- |
+ static Animation* startAnimation(Element*, Vector<Dictionary> keyframesDictionaryVector, Dictionary timingInput); |
+ static Animation* startAnimation(Element*, Vector<Dictionary> keyframesDictionaryVector, double timingInput); |
+ static Animation* startAnimation(Element*, Vector<Dictionary> keyframesDictionaryVector); |
+ static void populateTiming(Timing&, Dictionary); |
friend class AnimationElementAnimationTest; |
}; |