| Index: Source/core/animation/Keyframe.h
|
| diff --git a/Source/core/animation/Keyframe.h b/Source/core/animation/Keyframe.h
|
| index 7455ebcc0977e0c7dddf411ca9554bc725bbe4af..ae5461829470b89b295df06e626d20a256d00455 100644
|
| --- a/Source/core/animation/Keyframe.h
|
| +++ b/Source/core/animation/Keyframe.h
|
| @@ -15,7 +15,7 @@ namespace blink {
|
| using PropertySet = HashSet<CSSPropertyID>;
|
|
|
| class Element;
|
| -class LayoutStyle;
|
| +class ComputedStyle;
|
|
|
| // FIXME: Make Keyframe immutable
|
| class Keyframe : public RefCountedWillBeGarbageCollectedFinalized<Keyframe> {
|
| @@ -60,14 +60,14 @@ public:
|
| virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> cloneWithOffset(double offset) const = 0;
|
|
|
| // FIXME: Remove this once CompositorAnimations no longer depends on AnimatableValues
|
| - virtual void populateAnimatableValue(CSSPropertyID, Element&, const LayoutStyle* baseStyle) const { }
|
| + virtual void populateAnimatableValue(CSSPropertyID, Element&, const ComputedStyle* baseStyle) const { }
|
| virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue() const = 0;
|
|
|
| virtual bool isAnimatableValuePropertySpecificKeyframe() const { return false; }
|
| virtual bool isStringPropertySpecificKeyframe() const { return false; }
|
|
|
| virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const = 0;
|
| - virtual PassRefPtrWillBeRawPtr<Interpolation> maybeCreateInterpolation(CSSPropertyID, blink::Keyframe::PropertySpecificKeyframe& end, Element*, const LayoutStyle* baseStyle) const = 0;
|
| + virtual PassRefPtrWillBeRawPtr<Interpolation> maybeCreateInterpolation(CSSPropertyID, blink::Keyframe::PropertySpecificKeyframe& end, Element*, const ComputedStyle* baseStyle) const = 0;
|
|
|
| DEFINE_INLINE_VIRTUAL_TRACE() { }
|
|
|
|
|