| Index: Source/core/animation/css/CSSAnimationUpdate.h
|
| diff --git a/Source/core/animation/css/CSSAnimationUpdate.h b/Source/core/animation/css/CSSAnimationUpdate.h
|
| index de790a44e33fbeaab01395c949d18859231ccd68..e99cea6c8a759adba6e11c5391a6db0255a5808b 100644
|
| --- a/Source/core/animation/css/CSSAnimationUpdate.h
|
| +++ b/Source/core/animation/css/CSSAnimationUpdate.h
|
| @@ -23,7 +23,7 @@ class InertAnimation;
|
|
|
| // This class stores the CSS Animations/Transitions information we use during a style recalc.
|
| // This includes updates to animations/transitions as well as the Interpolations to be applied.
|
| -class CSSAnimationUpdate final : public NoBaseWillBeGarbageCollectedFinalized<CSSAnimationUpdate> {
|
| +class CSSAnimationUpdate final : public GarbageCollectedFinalized<CSSAnimationUpdate> {
|
| public:
|
| class NewAnimation {
|
| ALLOW_ONLY_INLINE_ALLOCATION();
|
| @@ -33,7 +33,7 @@ public:
|
| {
|
| }
|
|
|
| - NewAnimation(AtomicString name, PassRefPtrWillBeRawPtr<InertAnimation> animation, Timing timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
|
| + NewAnimation(AtomicString name, InertAnimation* animation, Timing timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
|
| : name(name)
|
| , animation(animation)
|
| , timing(timing)
|
| @@ -49,7 +49,7 @@ public:
|
| }
|
|
|
| AtomicString name;
|
| - RefPtrWillBeMember<InertAnimation> animation;
|
| + Member<InertAnimation> animation;
|
| Timing timing;
|
| RefPtrWillBeMember<StyleRuleKeyframes> styleRule;
|
| unsigned styleRuleVersion;
|
| @@ -63,7 +63,7 @@ public:
|
| {
|
| }
|
|
|
| - UpdatedAnimation(AtomicString name, AnimationPlayer* player, PassRefPtrWillBeRawPtr<InertAnimation> animation, Timing specifiedTiming, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
|
| + UpdatedAnimation(AtomicString name, AnimationPlayer* player, InertAnimation* animation, Timing specifiedTiming, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
|
| : name(name)
|
| , player(player)
|
| , animation(animation)
|
| @@ -82,7 +82,7 @@ public:
|
|
|
| AtomicString name;
|
| RawPtrWillBeMember<AnimationPlayer> player;
|
| - RefPtrWillBeMember<InertAnimation> animation;
|
| + Member<InertAnimation> animation;
|
| Timing specifiedTiming;
|
| RefPtrWillBeMember<StyleRuleKeyframes> styleRule;
|
| unsigned styleRuleVersion;
|
| @@ -95,9 +95,9 @@ public:
|
| DISALLOW_ALLOCATION();
|
|
|
| public:
|
| - RefPtrWillBeMember<AnimatableValue> opacity;
|
| - RefPtrWillBeMember<AnimatableValue> transform;
|
| - RefPtrWillBeMember<AnimatableValue> webkitFilter;
|
| + Member<AnimatableValue> opacity;
|
| + Member<AnimatableValue> transform;
|
| + Member<AnimatableValue> webkitFilter;
|
|
|
| DEFINE_INLINE_TRACE()
|
| {
|
| @@ -126,11 +126,11 @@ public:
|
| }
|
|
|
| RawPtrWillBeMember<AnimationPlayer> player;
|
| - RawPtrWillBeMember<KeyframeEffectModelBase> effect;
|
| + Member<KeyframeEffectModelBase> effect;
|
| CompositableStyleSnapshot snapshot;
|
| };
|
|
|
| - void startAnimation(const AtomicString& animationName, PassRefPtrWillBeRawPtr<InertAnimation> animation, const Timing& timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
|
| + void startAnimation(const AtomicString& animationName, InertAnimation* animation, const Timing& timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
|
| {
|
| animation->setName(animationName);
|
| m_newAnimations.append(NewAnimation(animationName, animation, timing, styleRule));
|
| @@ -146,7 +146,7 @@ public:
|
| {
|
| m_animationsWithPauseToggled.append(name);
|
| }
|
| - void updateAnimation(const AtomicString& name, AnimationPlayer* player, PassRefPtrWillBeRawPtr<InertAnimation> animation, const Timing& specifiedTiming,
|
| + void updateAnimation(const AtomicString& name, AnimationPlayer* player, InertAnimation* animation, const Timing& specifiedTiming,
|
| PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
|
| {
|
| m_animationsWithUpdates.append(UpdatedAnimation(name, player, animation, specifiedTiming, styleRule));
|
| @@ -168,7 +168,7 @@ public:
|
| m_animationsWithStyleUpdates.append(UpdatedAnimationStyle(player, effect, snapshot));
|
| }
|
|
|
| - void startTransition(CSSPropertyID id, CSSPropertyID eventId, const AnimatableValue* from, const AnimatableValue* to, PassRefPtrWillBeRawPtr<InertAnimation> animation)
|
| + void startTransition(CSSPropertyID id, CSSPropertyID eventId, const AnimatableValue* from, const AnimatableValue* to, InertAnimation* animation)
|
| {
|
| animation->setName(getPropertyName(id));
|
| NewTransition newTransition;
|
| @@ -183,12 +183,12 @@ public:
|
| void cancelTransition(CSSPropertyID id) { m_cancelledTransitions.add(id); }
|
| void finishTransition(CSSPropertyID id) { m_finishedTransitions.add(id); }
|
|
|
| - const WillBeHeapVector<NewAnimation>& newAnimations() const { return m_newAnimations; }
|
| + const HeapVector<NewAnimation>& newAnimations() const { return m_newAnimations; }
|
| const Vector<AtomicString>& cancelledAnimationNames() const { return m_cancelledAnimationNames; }
|
| const WillBeHeapHashSet<RawPtrWillBeMember<const AnimationPlayer>>& suppressedAnimationAnimationPlayers() const { return m_suppressedAnimationPlayers; }
|
| const Vector<AtomicString>& animationsWithPauseToggled() const { return m_animationsWithPauseToggled; }
|
| - const WillBeHeapVector<UpdatedAnimation>& animationsWithUpdates() const { return m_animationsWithUpdates; }
|
| - const WillBeHeapVector<UpdatedAnimationStyle>& animationsWithStyleUpdates() const { return m_animationsWithStyleUpdates; }
|
| + const HeapVector<UpdatedAnimation>& animationsWithUpdates() const { return m_animationsWithUpdates; }
|
| + const HeapVector<UpdatedAnimationStyle>& animationsWithStyleUpdates() const { return m_animationsWithStyleUpdates; }
|
|
|
| struct NewTransition {
|
| ALLOW_ONLY_INLINE_ALLOCATION();
|
| @@ -202,11 +202,11 @@ public:
|
|
|
| CSSPropertyID id;
|
| CSSPropertyID eventId;
|
| - RawPtrWillBeMember<const AnimatableValue> from;
|
| - RawPtrWillBeMember<const AnimatableValue> to;
|
| - RefPtrWillBeMember<InertAnimation> animation;
|
| + Member<const AnimatableValue> from;
|
| + Member<const AnimatableValue> to;
|
| + Member<InertAnimation> animation;
|
| };
|
| - using NewTransitionMap = WillBeHeapHashMap<CSSPropertyID, NewTransition>;
|
| + using NewTransitionMap = HeapHashMap<CSSPropertyID, NewTransition>;
|
| const NewTransitionMap& newTransitions() const { return m_newTransitions; }
|
| const HashSet<CSSPropertyID>& cancelledTransitions() const { return m_cancelledTransitions; }
|
| const HashSet<CSSPropertyID>& finishedTransitions() const { return m_finishedTransitions; }
|
| @@ -239,12 +239,12 @@ private:
|
| // will be started. Note that there may be multiple animations present
|
| // with the same name, due to the way in which we split up animations with
|
| // incomplete keyframes.
|
| - WillBeHeapVector<NewAnimation> m_newAnimations;
|
| + HeapVector<NewAnimation> m_newAnimations;
|
| Vector<AtomicString> m_cancelledAnimationNames;
|
| WillBeHeapHashSet<RawPtrWillBeMember<const AnimationPlayer>> m_suppressedAnimationPlayers;
|
| Vector<AtomicString> m_animationsWithPauseToggled;
|
| - WillBeHeapVector<UpdatedAnimation> m_animationsWithUpdates;
|
| - WillBeHeapVector<UpdatedAnimationStyle> m_animationsWithStyleUpdates;
|
| + HeapVector<UpdatedAnimation> m_animationsWithUpdates;
|
| + HeapVector<UpdatedAnimationStyle> m_animationsWithStyleUpdates;
|
|
|
| NewTransitionMap m_newTransitions;
|
| HashSet<CSSPropertyID> m_cancelledTransitions;
|
|
|