| Index: Source/core/animation/Animation.h
|
| diff --git a/Source/core/animation/Animation.h b/Source/core/animation/Animation.h
|
| index f360e3c9a57909c5249bf91080146c5a504681ce..abc1be35e82ba28cab42075d6a46bb3f3c48596c 100644
|
| --- a/Source/core/animation/Animation.h
|
| +++ b/Source/core/animation/Animation.h
|
| @@ -32,7 +32,9 @@
|
| #define Animation_h
|
|
|
| #include "core/animation/AnimationEffect.h"
|
| +#include "core/animation/EffectInput.h"
|
| #include "core/animation/TimedItem.h"
|
| +#include "core/animation/TimingInput.h"
|
| #include "heap/Handle.h"
|
| #include "wtf/RefPtr.h"
|
|
|
| @@ -48,9 +50,12 @@ public:
|
|
|
| static PassRefPtr<Animation> create(PassRefPtr<Element>, PassRefPtrWillBeRawPtr<AnimationEffect>, const Timing&, Priority = DefaultPriority, PassOwnPtr<EventDelegate> = nullptr);
|
| // Web Animations API Bindings constructors.
|
| - static PassRefPtr<Animation> create(Element*, Vector<Dictionary> keyframeDictionaryVector, Dictionary timingInput);
|
| - static PassRefPtr<Animation> create(Element*, Vector<Dictionary> keyframeDictionaryVector, double timingInput);
|
| - static PassRefPtr<Animation> create(Element*, Vector<Dictionary> keyframeDictionaryVector);
|
| + static PassRefPtr<Animation> create(Element*, PassRefPtrWillBeRawPtr<AnimationEffect>, const Dictionary& timingInputDictionary);
|
| + static PassRefPtr<Animation> create(Element*, PassRefPtrWillBeRawPtr<AnimationEffect>, double duration);
|
| + static PassRefPtr<Animation> create(Element*, PassRefPtrWillBeRawPtr<AnimationEffect>);
|
| + static PassRefPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, const Dictionary& timingInputDictionary);
|
| + static PassRefPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, double duration);
|
| + static PassRefPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector);
|
|
|
| // FIXME: Move all of these setter methods out of Animation,
|
| // possibly into a new class (TimingInput?).
|
| @@ -95,10 +100,6 @@ protected:
|
|
|
| private:
|
| static void populateTiming(Timing&, Dictionary);
|
| - // createUnsafe should only be directly called from tests.
|
| - static PassRefPtr<Animation> createUnsafe(Element*, Vector<Dictionary> keyframeDictionaryVector, Dictionary timingInput);
|
| - static PassRefPtr<Animation> createUnsafe(Element*, Vector<Dictionary> keyframeDictionaryVector, double timingInput);
|
| - static PassRefPtr<Animation> createUnsafe(Element*, Vector<Dictionary> keyframeDictionaryVector);
|
|
|
| Animation(PassRefPtr<Element>, PassRefPtrWillBeRawPtr<AnimationEffect>, const Timing&, Priority, PassOwnPtr<EventDelegate>);
|
|
|
| @@ -114,7 +115,6 @@ private:
|
|
|
| friend class CSSAnimations;
|
| friend class AnimationAnimationV8Test;
|
| - friend class AnimationAnimationTimingInputTest;
|
| };
|
|
|
| DEFINE_TYPE_CASTS(Animation, TimedItem, timedItem, timedItem->isAnimation(), timedItem.isAnimation());
|
|
|