| Index: third_party/WebKit/Source/core/animation/KeyframeEffect.h
|
| diff --git a/third_party/WebKit/Source/core/animation/KeyframeEffect.h b/third_party/WebKit/Source/core/animation/KeyframeEffect.h
|
| index 5c5471ede36043c4774c0261a58d24fb14bd1a20..c844a36610d2557ad87c09cd776ebe5e7afdfd37 100644
|
| --- a/third_party/WebKit/Source/core/animation/KeyframeEffect.h
|
| +++ b/third_party/WebKit/Source/core/animation/KeyframeEffect.h
|
| @@ -32,9 +32,9 @@
|
| #define KeyframeEffect_h
|
|
|
| #include "core/CoreExport.h"
|
| -#include "core/animation/AnimationEffectReadOnly.h"
|
| #include "core/animation/EffectInput.h"
|
| #include "core/animation/EffectModel.h"
|
| +#include "core/animation/KeyframeEffectReadOnly.h"
|
| #include "core/animation/TimingInput.h"
|
| #include "platform/heap/Handle.h"
|
| #include "wtf/RefPtr.h"
|
| @@ -50,12 +50,10 @@ class SampledEffect;
|
|
|
| // Represents the effect of an Animation on an Element's properties.
|
| // http://w3c.github.io/web-animations/#keyframe-effect
|
| -class CORE_EXPORT KeyframeEffect final : public AnimationEffectReadOnly {
|
| +class CORE_EXPORT KeyframeEffect final : public KeyframeEffectReadOnly {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| - enum Priority { DefaultPriority, TransitionPriority };
|
| -
|
| - static KeyframeEffect* create(Element*, EffectModel*, const Timing&, Priority = DefaultPriority, EventDelegate* = nullptr);
|
| + static KeyframeEffect* create(Element*, EffectModel*, const Timing&, KeyframeEffectReadOnly::Priority = KeyframeEffectReadOnly::DefaultPriority, EventDelegate* = nullptr);
|
| // Web Animations API Bindings constructors.
|
| static KeyframeEffect* create(ExecutionContext*, Element*, const DictionarySequenceOrDictionary& effectInput, double duration, ExceptionState&);
|
| static KeyframeEffect* create(ExecutionContext*, Element*, const DictionarySequenceOrDictionary& effectInput, const KeyframeEffectOptions& timingInput, ExceptionState&);
|
| @@ -69,7 +67,7 @@ public:
|
| const EffectModel* model() const { return m_model.get(); }
|
| EffectModel* model() { return m_model.get(); }
|
| void setModel(EffectModel* model) { m_model = model; }
|
| - Priority getPriority() const { return m_priority; }
|
| + KeyframeEffectReadOnly::Priority getPriority() const { return m_priority; }
|
| Element* target() const { return m_target; }
|
|
|
| void notifySampledEffectRemovedFromAnimationStack();
|
| @@ -90,7 +88,7 @@ public:
|
|
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| - void downgradeToNormal() { m_priority = DefaultPriority; }
|
| + void downgradeToNormal() { m_priority = KeyframeEffectReadOnly::DefaultPriority; }
|
|
|
| protected:
|
| void applyEffects();
|
| @@ -104,13 +102,7 @@ protected:
|
| bool hasMultipleTransformProperties() const;
|
|
|
| private:
|
| - KeyframeEffect(Element*, EffectModel*, const Timing&, Priority, EventDelegate*);
|
| -
|
| - Member<Element> m_target;
|
| - Member<EffectModel> m_model;
|
| - Member<SampledEffect> m_sampledEffect;
|
| -
|
| - Priority m_priority;
|
| + KeyframeEffect(Element*, EffectModel*, const Timing&, KeyframeEffectReadOnly::Priority, EventDelegate*);
|
|
|
| Vector<int> m_compositorAnimationIds;
|
|
|
|
|