| Index: Source/core/animation/KeyframeEffectModel.h
|
| diff --git a/Source/core/animation/KeyframeEffectModel.h b/Source/core/animation/KeyframeEffectModel.h
|
| index aa8c02dc7193f8211aa5de38ddc7cfde3441f9ae..2a83ab16af40914f358c4f07fefcdbc421ee8a9e 100644
|
| --- a/Source/core/animation/KeyframeEffectModel.h
|
| +++ b/Source/core/animation/KeyframeEffectModel.h
|
| @@ -103,7 +103,7 @@ public:
|
|
|
| // FIXME: This is a hack used to resolve CSSValues to AnimatableValues while we have a valid handle on an element.
|
| // This should be removed once AnimatableValues are obsolete.
|
| - void forceConversionsToAnimatableValues(Element&, const LayoutStyle* baseStyle);
|
| + void forceConversionsToAnimatableValues(Element&, const ComputedStyle* baseStyle);
|
| bool updateNeutralKeyframeAnimatableValues(CSSPropertyID, PassRefPtrWillBeRawPtr<AnimatableValue>);
|
|
|
| template<typename T>
|
| @@ -127,8 +127,8 @@ protected:
|
|
|
| // Lazily computes the groups of property-specific keyframes.
|
| void ensureKeyframeGroups() const;
|
| - void ensureInterpolationEffect(Element* = nullptr, const LayoutStyle* baseStyle = nullptr) const;
|
| - void snapshotCompositableProperties(Element&, const LayoutStyle* baseStyle);
|
| + void ensureInterpolationEffect(Element* = nullptr, const ComputedStyle* baseStyle = nullptr) const;
|
| + void snapshotCompositableProperties(Element&, const ComputedStyle* baseStyle);
|
|
|
| KeyframeVector m_keyframes;
|
| // The spec describes filtering the normalized keyframes at sampling time
|
|
|