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

Unified Diff: Source/core/animation/KeyframeEffectModel.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
« no previous file with comments | « Source/core/animation/KeyframeEffectModel.h ('k') | Source/core/animation/KeyframeEffectModelTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/KeyframeEffectModel.cpp
diff --git a/Source/core/animation/KeyframeEffectModel.cpp b/Source/core/animation/KeyframeEffectModel.cpp
index 9b774ec51699ea87df5b505ea50f552e5f8ff4c1..b39b5de1dcc5eeb96b1e7f79d761ab151c63cc29 100644
--- a/Source/core/animation/KeyframeEffectModel.cpp
+++ b/Source/core/animation/KeyframeEffectModel.cpp
@@ -32,7 +32,7 @@
#include "core/animation/KeyframeEffectModel.h"
#include "core/StylePropertyShorthand.h"
-#include "core/animation/AnimationNode.h"
+#include "core/animation/AnimationEffect.h"
#include "core/animation/CompositorAnimations.h"
#include "core/animation/css/CSSAnimatableValueFactory.h"
#include "core/animation/css/CSSPropertyEquality.h"
@@ -57,7 +57,7 @@ PropertyHandleSet KeyframeEffectModelBase::properties() const
void KeyframeEffectModelBase::setFrames(KeyframeVector& keyframes)
{
- // TODO(samli): Should also notify/invalidate the player
+ // TODO(samli): Should also notify/invalidate the animation
m_keyframes = keyframes;
m_keyframeGroups = nullptr;
m_interpolationEffect = nullptr;
@@ -210,7 +210,7 @@ bool KeyframeEffectModelBase::isReplaceOnly()
ensureKeyframeGroups();
for (const auto& entry : *m_keyframeGroups) {
for (const auto& keyframe : entry.value->keyframes()) {
- if (keyframe->composite() != AnimationEffect::CompositeReplace)
+ if (keyframe->composite() != EffectModel::CompositeReplace)
return false;
}
}
@@ -224,10 +224,10 @@ DEFINE_TRACE(KeyframeEffectModelBase)
visitor->trace(m_keyframeGroups);
#endif
visitor->trace(m_interpolationEffect);
- AnimationEffect::trace(visitor);
+ EffectModel::trace(visitor);
}
-Keyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, AnimationEffect::CompositeOperation composite)
+Keyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, EffectModel::CompositeOperation composite)
: m_offset(offset)
, m_easing(easing)
, m_composite(composite)
« no previous file with comments | « Source/core/animation/KeyframeEffectModel.h ('k') | Source/core/animation/KeyframeEffectModelTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698