Index: third_party/WebKit/Source/core/animation/TimingInput.h |
diff --git a/third_party/WebKit/Source/core/animation/TimingInput.h b/third_party/WebKit/Source/core/animation/TimingInput.h |
index 9f1549775ed8f8df14f0f80609b2a4e13aec3ca3..5ab4b58c26a71576b7b9c9502120b840211151a9 100644 |
--- a/third_party/WebKit/Source/core/animation/TimingInput.h |
+++ b/third_party/WebKit/Source/core/animation/TimingInput.h |
@@ -13,8 +13,10 @@ namespace blink { |
class Document; |
class ExceptionState; |
+class KeyframeAnimationOptions; |
class KeyframeEffectOptions; |
class UnrestrictedDoubleOrString; |
+class UnrestrictedDoubleOrKeyframeAnimationOptions; |
class UnrestrictedDoubleOrKeyframeEffectOptions; |
class CORE_EXPORT TimingInput { |
@@ -25,10 +27,19 @@ class CORE_EXPORT TimingInput { |
Timing& timing_output, |
Document*, |
ExceptionState&); |
+ static bool Convert(const UnrestrictedDoubleOrKeyframeAnimationOptions&, |
+ Timing& timing_output, |
+ Document*, |
+ ExceptionState&); |
static bool Convert(const KeyframeEffectOptions& timing_input, |
Timing& timing_output, |
Document*, |
ExceptionState&); |
+ static bool Convert(const KeyframeAnimationOptions& timing_input, |
+ Timing& timing_output, |
+ Document*, |
+ ExceptionState&); |
+ |
static bool Convert(double duration, Timing& timing_output, ExceptionState&); |
static void SetStartDelay(Timing&, double start_delay); |