Index: Source/core/animation/css/CSSAnimations.h |
diff --git a/Source/core/animation/css/CSSAnimations.h b/Source/core/animation/css/CSSAnimations.h |
index fbc767dd0fd424140cac3b0d109ff109cd5d9390..d8cc4e729750bdfa72b9aed40338ec54c49a2384 100644 |
--- a/Source/core/animation/css/CSSAnimations.h |
+++ b/Source/core/animation/css/CSSAnimations.h |
@@ -72,6 +72,7 @@ public: |
{ |
m_pendingUpdate.clear(); |
} |
+ |
void maybeApplyPendingUpdate(Element*); |
bool isEmpty() const { return m_animations.isEmpty() && m_transitions.isEmpty() && m_pendingUpdate.isEmpty(); } |
void cancel(); |
@@ -79,15 +80,18 @@ public: |
DECLARE_TRACE(); |
private: |
- class RunningAnimation final : public RefCountedWillBeGarbageCollectedFinalized<RunningAnimation> { |
+ class RunningAnimation final : public GarbageCollectedFinalized<RunningAnimation> { |
public: |
- RunningAnimation(PassRefPtrWillBeRawPtr<Animation> animation, CSSAnimationUpdate::NewAnimation newAnimation) |
+ RunningAnimation(Animation* animation, CSSAnimationUpdate::NewAnimation newAnimation) |
: animation(animation) |
, specifiedTiming(newAnimation.timing) |
, styleRule(newAnimation.styleRule) |
, styleRuleVersion(newAnimation.styleRuleVersion) |
{ |
} |
+ ~RunningAnimation() |
+ { |
+ } |
void update(CSSAnimationUpdate::UpdatedAnimation update) |
{ |
@@ -102,7 +106,7 @@ private: |
visitor->trace(styleRule); |
} |
- RefPtrWillBeMember<Animation> animation; |
+ Member<Animation> animation; |
Timing specifiedTiming; |
RefPtrWillBeMember<StyleRuleKeyframes> styleRule; |
unsigned styleRuleVersion; |
@@ -118,15 +122,15 @@ private: |
visitor->trace(to); |
} |
- RefPtrWillBeMember<Animation> animation; |
- RawPtrWillBeMember<const AnimatableValue> from; |
- RawPtrWillBeMember<const AnimatableValue> to; |
+ Member<Animation> animation; |
+ Member<const AnimatableValue> from; |
+ Member<const AnimatableValue> to; |
}; |
- using AnimationMap = WillBeHeapHashMap<AtomicString, RefPtrWillBeMember<RunningAnimation>>; |
+ using AnimationMap = HeapHashMap<AtomicString, Member<RunningAnimation>>; |
AnimationMap m_animations; |
- using TransitionMap = WillBeHeapHashMap<CSSPropertyID, RunningTransition>; |
+ using TransitionMap = HeapHashMap<CSSPropertyID, RunningTransition>; |
TransitionMap m_transitions; |
CSSAnimationUpdate m_pendingUpdate; |