Index: Source/core/animation/AnimationStack.h |
diff --git a/Source/core/animation/AnimationStack.h b/Source/core/animation/AnimationStack.h |
index 5ce8047c51c8730bc8e481504710144a8188e1e8..83371e8554f4f5162e7b9e10d754a045295f1e75 100644 |
--- a/Source/core/animation/AnimationStack.h |
+++ b/Source/core/animation/AnimationStack.h |
@@ -43,20 +43,23 @@ namespace WebCore { |
class InertAnimation; |
class AnimationStack { |
+ DISALLOW_ALLOCATION(); |
WTF_MAKE_NONCOPYABLE(AnimationStack); |
public: |
AnimationStack(); |
- void add(PassOwnPtr<SampledEffect> effect) { m_effects.append(effect); } |
+ void add(PassOwnPtrWillBeRawPtr<SampledEffect> effect) { m_effects.append(effect); } |
bool isEmpty() const { return m_effects.isEmpty(); } |
bool affects(CSSPropertyID) const; |
bool hasActiveAnimationsOnCompositor(CSSPropertyID) const; |
- static WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > activeInterpolations(AnimationStack*, const Vector<InertAnimation*>* newAnimations, const HashSet<const AnimationPlayer*>* cancelledAnimationPlayers, Animation::Priority, double timelineCurrentTime); |
+ static WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > activeInterpolations(AnimationStack*, const WillBeHeapVector<RawPtrWillBeMember<InertAnimation> >* newAnimations, const WillBeHeapHashSet<RawPtrWillBeMember<const AnimationPlayer> >* cancelledAnimationPlayers, Animation::Priority, double timelineCurrentTime); |
+ |
+ void trace(Visitor*); |
private: |
void simplifyEffects(); |
// Effects sorted by priority. Lower priority at the start of the list. |
- Vector<OwnPtr<SampledEffect> > m_effects; |
+ WillBeHeapVector<OwnPtrWillBeMember<SampledEffect> > m_effects; |
friend class AnimationAnimationStackTest; |
}; |