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

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

Issue 19266007: Web Animations: Introduce ActiveAnimations and AnimationStack (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased. Created 7 years, 5 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/ActiveAnimations.h ('k') | Source/core/animation/Animation.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/Animation.h
diff --git a/Source/core/animation/Animation.h b/Source/core/animation/Animation.h
index f72d57ac5e5fd993ea4f360163ee7e351343b920..41e288991c6e282302f8233ce5b4569576edc007 100644
--- a/Source/core/animation/Animation.h
+++ b/Source/core/animation/Animation.h
@@ -43,7 +43,6 @@ class Animation FINAL : public TimedItem {
public:
static PassRefPtr<Animation> create(PassRefPtr<Element>, PassRefPtr<AnimationEffect>, const Timing&);
- virtual ~Animation();
const AnimationEffect::CompositableValueMap* compositableValues() const
{
@@ -55,13 +54,15 @@ protected:
virtual void applyEffects(bool previouslyActiveOrInEffect);
virtual void clearEffects();
virtual void updateChildrenAndEffects(bool) const OVERRIDE FINAL;
+ virtual void willDetach() OVERRIDE FINAL;
private:
Animation(PassRefPtr<Element>, PassRefPtr<AnimationEffect>, const Timing&);
RefPtr<Element> m_target;
RefPtr<AnimationEffect> m_effect;
- bool m_isInTargetActiveAnimationsList;
+
+ bool m_activeInAnimationStack;
OwnPtr<AnimationEffect::CompositableValueMap> m_compositableValues;
};
« no previous file with comments | « Source/core/animation/ActiveAnimations.h ('k') | Source/core/animation/Animation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698