| 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;
|
| };
|
|
|
|
|