OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 25 matching lines...) Expand all Loading... |
36 #include "wtf/RefPtr.h" | 36 #include "wtf/RefPtr.h" |
37 | 37 |
38 namespace WebCore { | 38 namespace WebCore { |
39 | 39 |
40 class Element; | 40 class Element; |
41 | 41 |
42 class Animation FINAL : public TimedItem { | 42 class Animation FINAL : public TimedItem { |
43 | 43 |
44 public: | 44 public: |
45 static PassRefPtr<Animation> create(PassRefPtr<Element>, PassRefPtr<Animatio
nEffect>, const Timing&); | 45 static PassRefPtr<Animation> create(PassRefPtr<Element>, PassRefPtr<Animatio
nEffect>, const Timing&); |
46 virtual ~Animation(); | |
47 | 46 |
48 const AnimationEffect::CompositableValueMap* compositableValues() const | 47 const AnimationEffect::CompositableValueMap* compositableValues() const |
49 { | 48 { |
50 ASSERT(m_compositableValues); | 49 ASSERT(m_compositableValues); |
51 return m_compositableValues.get(); | 50 return m_compositableValues.get(); |
52 } | 51 } |
53 | 52 |
54 protected: | 53 protected: |
55 virtual void applyEffects(bool previouslyActiveOrInEffect); | 54 virtual void applyEffects(bool previouslyActiveOrInEffect); |
56 virtual void clearEffects(); | 55 virtual void clearEffects(); |
57 virtual void updateChildrenAndEffects(bool) const OVERRIDE FINAL; | 56 virtual void updateChildrenAndEffects(bool) const OVERRIDE FINAL; |
| 57 virtual void willDetach() OVERRIDE FINAL; |
58 | 58 |
59 private: | 59 private: |
60 Animation(PassRefPtr<Element>, PassRefPtr<AnimationEffect>, const Timing&); | 60 Animation(PassRefPtr<Element>, PassRefPtr<AnimationEffect>, const Timing&); |
61 | 61 |
62 RefPtr<Element> m_target; | 62 RefPtr<Element> m_target; |
63 RefPtr<AnimationEffect> m_effect; | 63 RefPtr<AnimationEffect> m_effect; |
64 bool m_isInTargetActiveAnimationsList; | 64 |
| 65 bool m_activeInAnimationStack; |
65 OwnPtr<AnimationEffect::CompositableValueMap> m_compositableValues; | 66 OwnPtr<AnimationEffect::CompositableValueMap> m_compositableValues; |
66 }; | 67 }; |
67 | 68 |
68 } // namespace WebCore | 69 } // namespace WebCore |
69 | 70 |
70 #endif | 71 #endif |
OLD | NEW |