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

Unified Diff: Source/core/animation/KeyframeEffectModel.h

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/KeyframeEffect.idl ('k') | Source/core/animation/KeyframeEffectModel.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/KeyframeEffectModel.h
diff --git a/Source/core/animation/KeyframeEffectModel.h b/Source/core/animation/KeyframeEffectModel.h
index 61891ab7d7b232c929db514a6fa3b4e25856759e..aec30e83de7780902b62337b43adc083fcf49c39 100644
--- a/Source/core/animation/KeyframeEffectModel.h
+++ b/Source/core/animation/KeyframeEffectModel.h
@@ -33,7 +33,7 @@
#include "core/CoreExport.h"
#include "core/animation/AnimationEffect.h"
-#include "core/animation/AnimationNode.h"
+#include "core/animation/EffectModel.h"
#include "core/animation/InterpolationEffect.h"
#include "core/animation/PropertyHandle.h"
#include "core/animation/StringKeyframe.h"
@@ -52,7 +52,7 @@ namespace blink {
class Element;
class KeyframeEffectModelTest;
-class CORE_EXPORT KeyframeEffectModelBase : public AnimationEffect {
+class CORE_EXPORT KeyframeEffectModelBase : public EffectModel {
public:
// FIXME: Implement accumulation.
@@ -87,7 +87,7 @@ public:
return m_keyframeGroups->get(property)->keyframes();
}
- // AnimationEffect implementation.
+ // EffectModel implementation.
virtual void sample(int iteration, double fraction, double iterationDuration, OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>>&) const override;
virtual bool isKeyframeEffectModel() const override { return true; }
@@ -177,26 +177,26 @@ using StringKeyframeEffectModel = KeyframeEffectModel<StringKeyframe>;
using StringKeyframeVector = StringKeyframeEffectModel::KeyframeVector;
using StringPropertySpecificKeyframeVector = StringKeyframeEffectModel::PropertySpecificKeyframeVector;
-DEFINE_TYPE_CASTS(KeyframeEffectModelBase, AnimationEffect, value, value->isKeyframeEffectModel(), value.isKeyframeEffectModel());
+DEFINE_TYPE_CASTS(KeyframeEffectModelBase, EffectModel, value, value->isKeyframeEffectModel(), value.isKeyframeEffectModel());
DEFINE_TYPE_CASTS(AnimatableValueKeyframeEffectModel, KeyframeEffectModelBase, value, value->isAnimatableValueKeyframeEffectModel(), value.isAnimatableValueKeyframeEffectModel());
DEFINE_TYPE_CASTS(StringKeyframeEffectModel, KeyframeEffectModelBase, value, value->isStringKeyframeEffectModel(), value.isStringKeyframeEffectModel());
-inline const AnimatableValueKeyframeEffectModel* toAnimatableValueKeyframeEffectModel(const AnimationEffect* base)
+inline const AnimatableValueKeyframeEffectModel* toAnimatableValueKeyframeEffectModel(const EffectModel* base)
{
return toAnimatableValueKeyframeEffectModel(toKeyframeEffectModelBase(base));
}
-inline AnimatableValueKeyframeEffectModel* toAnimatableValueKeyframeEffectModel(AnimationEffect* base)
+inline AnimatableValueKeyframeEffectModel* toAnimatableValueKeyframeEffectModel(EffectModel* base)
{
return toAnimatableValueKeyframeEffectModel(toKeyframeEffectModelBase(base));
}
-inline const StringKeyframeEffectModel* toStringKeyframeEffectModel(const AnimationEffect* base)
+inline const StringKeyframeEffectModel* toStringKeyframeEffectModel(const EffectModel* base)
{
return toStringKeyframeEffectModel(toKeyframeEffectModelBase(base));
}
-inline StringKeyframeEffectModel* toStringKeyframeEffectModel(AnimationEffect* base)
+inline StringKeyframeEffectModel* toStringKeyframeEffectModel(EffectModel* base)
{
return toStringKeyframeEffectModel(toKeyframeEffectModelBase(base));
}
« no previous file with comments | « Source/core/animation/KeyframeEffect.idl ('k') | Source/core/animation/KeyframeEffectModel.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698