Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Unified Diff: Source/core/animation/animatable/AnimatableValueKeyframe.cpp

Issue 1113173003: Web Animations: Update naming to reflect spec changes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: No, really. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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)
« no previous file with comments | « Source/core/animation/animatable/AnimatableValueKeyframe.h ('k') | Source/core/animation/css/CSSAnimationUpdate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698