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

Unified Diff: Source/core/animation/InertAnimation.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/ElementAnimations.cpp ('k') | Source/core/animation/InertAnimation.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/InertAnimation.h
diff --git a/Source/core/animation/InertAnimation.h b/Source/core/animation/InertAnimation.h
index 1b3f80a7b5f78db71712d11e2f4c1f62514c32f8..e9b054f042fd4e99a8ed79e404f26b5a35c672ec 100644
--- a/Source/core/animation/InertAnimation.h
+++ b/Source/core/animation/InertAnimation.h
@@ -33,16 +33,16 @@
#include "core/CoreExport.h"
#include "core/animation/AnimationEffect.h"
-#include "core/animation/AnimationNode.h"
+#include "core/animation/EffectModel.h"
#include "wtf/RefPtr.h"
namespace blink {
-class CORE_EXPORT InertAnimation final : public AnimationNode {
+class CORE_EXPORT InertAnimation final : public AnimationEffect {
public:
- static PassRefPtrWillBeRawPtr<InertAnimation> create(PassRefPtrWillBeRawPtr<AnimationEffect>, const Timing&, bool paused, double inheritedTime);
+ static PassRefPtrWillBeRawPtr<InertAnimation> create(PassRefPtrWillBeRawPtr<EffectModel>, const Timing&, bool paused, double inheritedTime);
void sample(OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>>&);
- AnimationEffect* effect() const { return m_effect.get(); }
+ EffectModel* effect() const { return m_effect.get(); }
bool paused() const { return m_paused; }
DECLARE_VIRTUAL_TRACE();
@@ -52,8 +52,8 @@ protected:
virtual double calculateTimeToEffectChange(bool forwards, double inheritedTime, double timeToNextIteration) const override;
private:
- InertAnimation(PassRefPtrWillBeRawPtr<AnimationEffect>, const Timing&, bool paused, double inheritedTime);
- RefPtrWillBeMember<AnimationEffect> m_effect;
+ InertAnimation(PassRefPtrWillBeRawPtr<EffectModel>, const Timing&, bool paused, double inheritedTime);
+ RefPtrWillBeMember<EffectModel> m_effect;
bool m_paused;
double m_inheritedTime;
};
« no previous file with comments | « Source/core/animation/ElementAnimations.cpp ('k') | Source/core/animation/InertAnimation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698