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

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

Issue 1113173003: Web Animations: Update naming to reflect spec changes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Use new API in layout tests Created 5 years, 8 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/AnimationStack.h
diff --git a/Source/core/animation/AnimationStack.h b/Source/core/animation/AnimationStack.h
index 80aed6d7c775fa8b277aa95d21254f074703324e..561acc1aa0429b46dd66f43249d824ace4cf0408 100644
--- a/Source/core/animation/AnimationStack.h
+++ b/Source/core/animation/AnimationStack.h
@@ -33,8 +33,9 @@
#include "core/CoreExport.h"
#include "core/animation/Animation.h"
-#include "core/animation/AnimationEffect.h"
-#include "core/animation/AnimationPlayer.h"
+#include "core/animation/EffectModel.h"
+#include "core/animation/KeyframeEffect.h"
+#include "core/animation/PropertyHandle.h"
#include "core/animation/SampledEffect.h"
#include "platform/geometry/FloatBox.h"
#include "wtf/HashSet.h"
@@ -55,7 +56,7 @@ public:
void add(PassOwnPtrWillBeRawPtr<SampledEffect> effect) { m_effects.append(effect); }
bool isEmpty() const { return m_effects.isEmpty(); }
bool hasActiveAnimationsOnCompositor(CSSPropertyID) const;
- static ActiveInterpolationMap activeInterpolations(AnimationStack*, const WillBeHeapVector<RawPtrWillBeMember<InertAnimation>>* newAnimations, const WillBeHeapHashSet<RawPtrWillBeMember<const AnimationPlayer>>* suppressedAnimationPlayers, Animation::Priority, double timelineCurrentTime);
+ static ActiveInterpolationMap activeInterpolations(AnimationStack*, const WillBeHeapVector<RawPtrWillBeMember<InertAnimation>>* newAnimations, const WillBeHeapHashSet<RawPtrWillBeMember<const Animation>>* suppressedAnimations, KeyframeEffect::Priority, double timelineCurrentTime);
bool getAnimatedBoundingBox(FloatBox&, CSSPropertyID) const;
DECLARE_TRACE();

Powered by Google App Engine
This is Rietveld 408576698