Index: Source/core/animation/ActiveAnimations.h |
diff --git a/Source/core/animation/ActiveAnimations.h b/Source/core/animation/ActiveAnimations.h |
index 64d665b61ae56b85ce6b4cd9e47914812bef4e0e..b0ebcc50f8e99cede07d2f0610408d38bfda80ae 100644 |
--- a/Source/core/animation/ActiveAnimations.h |
+++ b/Source/core/animation/ActiveAnimations.h |
@@ -49,11 +49,7 @@ typedef WillBeHeapHashCountedSet<RawPtrWillBeWeakMember<AnimationPlayer> > Anima |
class ActiveAnimations : public NoBaseWillBeGarbageCollectedFinalized<ActiveAnimations> { |
WTF_MAKE_NONCOPYABLE(ActiveAnimations); |
public: |
- ActiveAnimations() |
- : m_animationStyleChange(false) |
- { |
- } |
- |
+ ActiveAnimations(); |
~ActiveAnimations(); |
// Animations that are currently active for this element, their effects will be applied |
@@ -75,6 +71,10 @@ public: |
void updateAnimationFlags(RenderStyle&); |
void setAnimationStyleChange(bool animationStyleChange) { m_animationStyleChange = animationStyleChange; } |
+ bool isAnimationStyleChange() const { return m_animationStyleChange; } |
+ |
+ const RenderStyle* baseRenderStyle() const { return m_baseRenderStyle.get(); } |
+ void setBaseRenderStyle(PassRefPtr<RenderStyle>); |
#if !ENABLE(OILPAN) |
void addAnimation(Animation* animation) { m_animations.append(animation); } |
@@ -84,12 +84,11 @@ public: |
void trace(Visitor*); |
private: |
- bool isAnimationStyleChange() const { return m_animationStyleChange; } |
- |
AnimationStack m_defaultStack; |
CSSAnimations m_cssAnimations; |
AnimationPlayerCountedSet m_players; |
bool m_animationStyleChange; |
+ RefPtr<RenderStyle> m_baseRenderStyle; |
#if !ENABLE(OILPAN) |
// FIXME: Oilpan: This is to avoid a reference cycle that keeps Elements alive |