| Index: Source/core/animation/KeyframeEffectModel.h
|
| diff --git a/Source/core/animation/KeyframeEffectModel.h b/Source/core/animation/KeyframeEffectModel.h
|
| index 8029b3c99d2ce7c6141e352cc6c739225e780a3e..1c1c038a907e6bde38c62a4a293b2e871fbff211 100644
|
| --- a/Source/core/animation/KeyframeEffectModel.h
|
| +++ b/Source/core/animation/KeyframeEffectModel.h
|
| @@ -109,6 +109,12 @@ public:
|
| ensureInterpolationEffect(element);
|
| }
|
|
|
| + void setDeferredInterpolationsOutdated() { m_interpolationEffect->setDeferredInterpolationsOutdated(); }
|
| +
|
| + void snapshotCompositableProperties(const Element*, const RenderStyle&);
|
| + void updateNeutralKeyframeAnimatableValues(CSSPropertyID, PassRefPtrWillBeRawPtr<AnimatableValue>);
|
| + void setNeutralKeyframeEasings(RefPtrWillBeRawPtr<TimingFunction>);
|
| +
|
| static KeyframeVector normalizedKeyframesForInspector(const KeyframeVector& keyframes) { return normalizedKeyframes(keyframes); }
|
|
|
| protected:
|
| @@ -130,7 +136,7 @@ protected:
|
|
|
| friend class KeyframeEffectModelTest;
|
|
|
| - bool affects(CSSPropertyID property)
|
| + bool affects(CSSPropertyID property) const
|
| {
|
| ensureKeyframeGroups();
|
| return m_keyframeGroups->contains(property);
|
| @@ -167,6 +173,7 @@ using StringPropertySpecificKeyframeVector = StringKeyframeEffectModel::Property
|
|
|
| DEFINE_TYPE_CASTS(KeyframeEffectModelBase, AnimationEffect, value, value->isKeyframeEffectModel(), value.isKeyframeEffectModel());
|
| DEFINE_TYPE_CASTS(AnimatableValueKeyframeEffectModel, KeyframeEffectModelBase, value, value->isAnimatableValueKeyframeEffectModel(), value.isAnimatableValueKeyframeEffectModel());
|
| +DEFINE_TYPE_CASTS(StringKeyframeEffectModel, KeyframeEffectModelBase, value, value->isStringKeyframeEffectModel(), value.isStringKeyframeEffectModel());
|
|
|
| inline const AnimatableValueKeyframeEffectModel* toAnimatableValueKeyframeEffectModel(const AnimationEffect* base)
|
| {
|
| @@ -178,6 +185,16 @@ inline AnimatableValueKeyframeEffectModel* toAnimatableValueKeyframeEffectModel(
|
| return toAnimatableValueKeyframeEffectModel(toKeyframeEffectModelBase(base));
|
| }
|
|
|
| +inline const StringKeyframeEffectModel* toStringKeyframeEffectModel(const AnimationEffect* base)
|
| +{
|
| + return toStringKeyframeEffectModel(toKeyframeEffectModelBase(base));
|
| +}
|
| +
|
| +inline StringKeyframeEffectModel* toStringKeyframeEffectModel(AnimationEffect* base)
|
| +{
|
| + return toStringKeyframeEffectModel(toKeyframeEffectModelBase(base));
|
| +}
|
| +
|
| template <>
|
| inline bool KeyframeEffectModel<AnimatableValueKeyframe>::isAnimatableValueKeyframeEffectModel() const { return true; }
|
|
|
|
|