Index: Source/core/animation/css/CSSAnimationUpdate.h |
diff --git a/Source/core/animation/css/CSSAnimationUpdate.h b/Source/core/animation/css/CSSAnimationUpdate.h |
index 6b70e3b9be2c4a74e6298b97f2818c7fe69d59a0..620e777c6554fe0f037ec2195694d30a94b99862 100644 |
--- a/Source/core/animation/css/CSSAnimationUpdate.h |
+++ b/Source/core/animation/css/CSSAnimationUpdate.h |
@@ -23,7 +23,7 @@ class InertEffect; |
// 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<InertEffect> effect, Timing timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule) |
+ NewAnimation(AtomicString name, InertEffect* effect, Timing timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule) |
: name(name) |
, effect(effect) |
, timing(timing) |
@@ -49,7 +49,7 @@ public: |
} |
AtomicString name; |
- RefPtrWillBeMember<InertEffect> effect; |
+ Member<InertEffect> effect; |
Timing timing; |
RefPtrWillBeMember<StyleRuleKeyframes> styleRule; |
unsigned styleRuleVersion; |
@@ -63,7 +63,7 @@ public: |
{ |
} |
- UpdatedAnimation(AtomicString name, Animation* animation, PassRefPtrWillBeRawPtr<InertEffect> effect, Timing specifiedTiming, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule) |
+ UpdatedAnimation(AtomicString name, Animation* animation, InertEffect* effect, Timing specifiedTiming, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule) |
: name(name) |
, animation(animation) |
, effect(effect) |
@@ -81,8 +81,8 @@ public: |
} |
AtomicString name; |
- RawPtrWillBeMember<Animation> animation; |
- RefPtrWillBeMember<InertEffect> effect; |
+ Member<Animation> animation; |
+ Member<InertEffect> effect; |
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() |
{ |
@@ -125,12 +125,12 @@ public: |
visitor->trace(snapshot); |
} |
- RawPtrWillBeMember<Animation> animation; |
- RawPtrWillBeMember<KeyframeEffectModelBase> model; |
+ Member<Animation> animation; |
+ Member<KeyframeEffectModelBase> model; |
CompositableStyleSnapshot snapshot; |
}; |
- void startAnimation(const AtomicString& animationName, PassRefPtrWillBeRawPtr<InertEffect> effect, const Timing& timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule) |
+ void startAnimation(const AtomicString& animationName, InertEffect* effect, const Timing& timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule) |
{ |
effect->setName(animationName); |
m_newAnimations.append(NewAnimation(animationName, effect, timing, styleRule)); |
@@ -146,8 +146,7 @@ public: |
{ |
m_animationsWithPauseToggled.append(name); |
} |
- void updateAnimation(const AtomicString& name, Animation* animation, PassRefPtrWillBeRawPtr<InertEffect> effect, const Timing& specifiedTiming, |
- PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule) |
+ void updateAnimation(const AtomicString& name, Animation* animation, InertEffect* effect, const Timing& specifiedTiming, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule) |
{ |
m_animationsWithUpdates.append(UpdatedAnimation(name, animation, effect, specifiedTiming, styleRule)); |
m_suppressedAnimations.add(animation); |
@@ -168,7 +167,7 @@ public: |
m_animationsWithStyleUpdates.append(UpdatedAnimationStyle(animation, model, snapshot)); |
} |
- void startTransition(CSSPropertyID id, const AnimatableValue* from, const AnimatableValue* to, PassRefPtrWillBeRawPtr<InertEffect> effect) |
+ void startTransition(CSSPropertyID id, const AnimatableValue* from, const AnimatableValue* to, InertEffect* effect) |
{ |
effect->setName(getPropertyName(id)); |
NewTransition newTransition; |
@@ -182,12 +181,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 Animation>>& suppressedAnimations() const { return m_suppressedAnimations; } |
+ const HeapHashSet<Member<const Animation>>& suppressedAnimations() const { return m_suppressedAnimations; } |
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(); |
@@ -200,11 +199,11 @@ public: |
} |
CSSPropertyID id; |
- RawPtrWillBeMember<const AnimatableValue> from; |
- RawPtrWillBeMember<const AnimatableValue> to; |
- RefPtrWillBeMember<InertEffect> effect; |
+ Member<const AnimatableValue> from; |
+ Member<const AnimatableValue> to; |
+ Member<InertEffect> effect; |
}; |
- 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; } |
@@ -237,12 +236,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 Animation>> m_suppressedAnimations; |
+ HeapHashSet<Member<const Animation>> m_suppressedAnimations; |
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; |