Index: Source/core/animation/ActiveAnimations.h |
diff --git a/Source/core/animation/ActiveAnimations.h b/Source/core/animation/ActiveAnimations.h |
index 64d665b61ae56b85ce6b4cd9e47914812bef4e0e..e575a8b7434bb1fbde5fadf46fc088ea4f07f401 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 |
@@ -76,6 +72,9 @@ public: |
void updateAnimationFlags(RenderStyle&); |
void setAnimationStyleChange(bool animationStyleChange) { m_animationStyleChange = animationStyleChange; } |
+ const RenderStyle* baseRenderStyle() const; |
+ void updateBaseRenderStyle(const RenderStyle*); |
+ |
#if !ENABLE(OILPAN) |
void addAnimation(Animation* animation) { m_animations.append(animation); } |
void notifyAnimationDestroyed(Animation* animation) { m_animations.remove(m_animations.find(animation)); } |
@@ -90,6 +89,7 @@ private: |
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 |