Index: Source/core/animation/AnimationStack.h |
diff --git a/Source/core/animation/AnimationStack.h b/Source/core/animation/AnimationStack.h |
index 80aed6d7c775fa8b277aa95d21254f074703324e..7bf4f0e452c7728a1e5f04990ae962fc7abfdc00 100644 |
--- a/Source/core/animation/AnimationStack.h |
+++ b/Source/core/animation/AnimationStack.h |
@@ -42,7 +42,7 @@ |
namespace blink { |
-using ActiveInterpolationMap = WillBeHeapHashMap<PropertyHandle, RefPtrWillBeMember<Interpolation>>; |
+using ActiveInterpolationMap = HeapHashMap<PropertyHandle, Member<Interpolation>>; |
class InertAnimation; |
@@ -52,17 +52,17 @@ class CORE_EXPORT AnimationStack { |
public: |
AnimationStack(); |
- void add(PassOwnPtrWillBeRawPtr<SampledEffect> effect) { m_effects.append(effect); } |
+ void add(SampledEffect* effect) { m_effects.append(effect); } |
bool isEmpty() const { return m_effects.isEmpty(); } |
bool hasActiveAnimationsOnCompositor(CSSPropertyID) const; |
- static ActiveInterpolationMap activeInterpolations(AnimationStack*, const WillBeHeapVector<RawPtrWillBeMember<InertAnimation>>* newAnimations, const WillBeHeapHashSet<RawPtrWillBeMember<const AnimationPlayer>>* suppressedAnimationPlayers, Animation::Priority, double timelineCurrentTime); |
+ static ActiveInterpolationMap activeInterpolations(AnimationStack*, const HeapVector<Member<InertAnimation>>* newAnimations, const WillBeHeapHashSet<RawPtrWillBeMember<const AnimationPlayer>>* suppressedAnimationPlayers, Animation::Priority, double timelineCurrentTime); |
bool getAnimatedBoundingBox(FloatBox&, CSSPropertyID) const; |
DECLARE_TRACE(); |
private: |
// Effects sorted by priority. Lower priority at the start of the list. |
- WillBeHeapVector<OwnPtrWillBeMember<SampledEffect>> m_effects; |
+ HeapVector<Member<SampledEffect>> m_effects; |
friend class AnimationAnimationStackTest; |
}; |