| Index: Source/core/animation/animatable/AnimatableValueKeyframe.cpp
|
| diff --git a/Source/core/animation/animatable/AnimatableValueKeyframe.cpp b/Source/core/animation/animatable/AnimatableValueKeyframe.cpp
|
| index 1337dbf5eb810ec3658209f2ef5e2d081bd06a56..87172c3c30d9cc0cca6e3ea03cfe44ade4b85154 100644
|
| --- a/Source/core/animation/animatable/AnimatableValueKeyframe.cpp
|
| +++ b/Source/core/animation/animatable/AnimatableValueKeyframe.cpp
|
| @@ -44,13 +44,13 @@ DEFINE_TRACE(AnimatableValueKeyframe)
|
| Keyframe::trace(visitor);
|
| }
|
|
|
| -AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const AnimatableValue* value, AnimationEffect::CompositeOperation op)
|
| +AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const AnimatableValue* value, EffectModel::CompositeOperation op)
|
| : Keyframe::PropertySpecificKeyframe(offset, easing, op)
|
| , m_value(const_cast<AnimatableValue*>(value))
|
| { }
|
|
|
| AnimatableValueKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtrWillBeRawPtr<AnimatableValue> value)
|
| - : Keyframe::PropertySpecificKeyframe(offset, easing, AnimationEffect::CompositeReplace)
|
| + : Keyframe::PropertySpecificKeyframe(offset, easing, EffectModel::CompositeReplace)
|
| , m_value(value)
|
| {
|
| ASSERT(!isNull(m_offset));
|
| @@ -70,7 +70,7 @@ PassRefPtrWillBeRawPtr<Interpolation> AnimatableValueKeyframe::PropertySpecificK
|
|
|
| PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::PropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const
|
| {
|
| - return adoptPtrWillBeNoop(new AnimatableValueKeyframe::PropertySpecificKeyframe(offset, easing, AnimatableValue::neutralValue(), AnimationEffect::CompositeAdd));
|
| + return adoptPtrWillBeNoop(new AnimatableValueKeyframe::PropertySpecificKeyframe(offset, easing, AnimatableValue::neutralValue(), EffectModel::CompositeAdd));
|
| }
|
|
|
| DEFINE_TRACE(AnimatableValueKeyframe::PropertySpecificKeyframe)
|
|
|