Index: Source/core/animation/KeyframeEffectModel.h |
diff --git a/Source/core/animation/KeyframeEffectModel.h b/Source/core/animation/KeyframeEffectModel.h |
index 8dc00c303c9a98f0957f8d13d0e99319281a6def..919be4767e32d8ad8f512ea89063da8c1977f9a7 100644 |
--- a/Source/core/animation/KeyframeEffectModel.h |
+++ b/Source/core/animation/KeyframeEffectModel.h |
@@ -56,10 +56,10 @@ class CORE_EXPORT KeyframeEffectModelBase : public EffectModel { |
public: |
// FIXME: Implement accumulation. |
- using PropertySpecificKeyframeVector = WillBeHeapVector<OwnPtrWillBeMember<Keyframe::PropertySpecificKeyframe>>; |
- class PropertySpecificKeyframeGroup : public NoBaseWillBeGarbageCollected<PropertySpecificKeyframeGroup> { |
+ using PropertySpecificKeyframeVector = HeapVector<Member<Keyframe::PropertySpecificKeyframe>>; |
+ class PropertySpecificKeyframeGroup : public GarbageCollected<PropertySpecificKeyframeGroup> { |
public: |
- void appendKeyframe(PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe>); |
+ void appendKeyframe(Keyframe::PropertySpecificKeyframe*); |
const PropertySpecificKeyframeVector& keyframes() const { return m_keyframes; } |
DECLARE_TRACE(); |
@@ -77,7 +77,7 @@ public: |
PropertyHandleSet properties() const; |
- using KeyframeVector = WillBeHeapVector<RefPtrWillBeMember<Keyframe>>; |
+ using KeyframeVector = HeapVector<Member<Keyframe>>; |
const KeyframeVector& getFrames() const { return m_keyframes; } |
void setFrames(KeyframeVector& keyframes); |
@@ -88,7 +88,7 @@ public: |
} |
// EffectModel implementation. |
- void sample(int iteration, double fraction, double iterationDuration, OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>>&) const override; |
+ void sample(int iteration, double fraction, double iterationDuration, HeapVector<Member<Interpolation>>*&) const override; |
bool isKeyframeEffectModel() const override { return true; } |
@@ -106,7 +106,7 @@ public: |
// FIXME: This is a hack used to resolve CSSValues to AnimatableValues while we have a valid handle on an element. |
// This should be removed once AnimatableValues are obsolete. |
void forceConversionsToAnimatableValues(Element&, const ComputedStyle* baseStyle); |
- bool updateNeutralKeyframeAnimatableValues(CSSPropertyID, PassRefPtrWillBeRawPtr<AnimatableValue>); |
+ bool updateNeutralKeyframeAnimatableValues(CSSPropertyID, AnimatableValue*); |
template<typename T> |
inline void forEachInterpolation(const T& callback) { m_interpolationEffect->forEachInterpolation(callback); } |
@@ -138,9 +138,9 @@ protected: |
// The spec describes filtering the normalized keyframes at sampling time |
// to get the 'property-specific keyframes'. For efficiency, we cache the |
// property-specific lists. |
- using KeyframeGroupMap = WillBeHeapHashMap<PropertyHandle, OwnPtrWillBeMember<PropertySpecificKeyframeGroup>>; |
- mutable OwnPtrWillBeMember<KeyframeGroupMap> m_keyframeGroups; |
- mutable RefPtrWillBeMember<InterpolationEffect> m_interpolationEffect; |
+ using KeyframeGroupMap = HeapHashMap<PropertyHandle, Member<PropertySpecificKeyframeGroup>>; |
+ mutable Member<KeyframeGroupMap> m_keyframeGroups; |
+ mutable Member<InterpolationEffect> m_interpolationEffect; |
RefPtr<TimingFunction> m_neutralKeyframeEasing; |
mutable bool m_hasSyntheticKeyframes; |
@@ -151,10 +151,10 @@ protected: |
template <class Keyframe> |
class KeyframeEffectModel final : public KeyframeEffectModelBase { |
public: |
- using KeyframeVector = WillBeHeapVector<RefPtrWillBeMember<Keyframe>>; |
- static PassRefPtrWillBeRawPtr<KeyframeEffectModel<Keyframe>> create(const KeyframeVector& keyframes, PassRefPtrWillBeRawPtr<TimingFunction> neutralKeyframeEasing = nullptr) |
+ using KeyframeVector = HeapVector<Member<Keyframe>>; |
+ static KeyframeEffectModel<Keyframe>* create(const KeyframeVector& keyframes, PassRefPtrWillBeRawPtr<TimingFunction> neutralKeyframeEasing = nullptr) |
{ |
- return adoptRefWillBeNoop(new KeyframeEffectModel(keyframes, neutralKeyframeEasing)); |
+ return new KeyframeEffectModel(keyframes, neutralKeyframeEasing); |
} |
private: |