| Index: Source/core/animation/SampledEffect.h
|
| diff --git a/Source/core/animation/SampledEffect.h b/Source/core/animation/SampledEffect.h
|
| index 3958636cf922d08834fb88f10ceecca9e75c64af..3e9afec79fc06eecf352b118ac94aef5afc5393b 100644
|
| --- a/Source/core/animation/SampledEffect.h
|
| +++ b/Source/core/animation/SampledEffect.h
|
| @@ -13,15 +13,15 @@
|
|
|
| namespace WebCore {
|
|
|
| -class SampledEffect {
|
| +class SampledEffect : public NoBaseWillBeGarbageCollected<SampledEffect> {
|
| public:
|
| - static PassOwnPtr<SampledEffect> create(Animation* animation, PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > interpolations)
|
| + static PassOwnPtrWillBeRawPtr<SampledEffect> create(Animation* animation, PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > interpolations)
|
| {
|
| - return adoptPtr(new SampledEffect(animation, interpolations));
|
| + return adoptPtrWillBeNoop(new SampledEffect(animation, interpolations));
|
| }
|
|
|
| bool canChange() const;
|
| - void clear();
|
| + void detach();
|
|
|
| const WillBeHeapVector<RefPtrWillBeMember<Interpolation> >& interpolations() const { return *m_interpolations; }
|
| void setInterpolations(PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > interpolations) { m_interpolations = interpolations; }
|
| @@ -32,14 +32,16 @@ public:
|
|
|
| void removeReplacedInterpolationsIfNeeded(const BitArray<numCSSProperties>&);
|
|
|
| + void trace(Visitor*);
|
| +
|
| private:
|
| SampledEffect(Animation*, PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > >);
|
|
|
| // When Animation and AnimationPlayer are moved to Oilpan, we won't need a
|
| // handle on the player and should only keep a weak pointer to the animation.
|
| - RefPtr<AnimationPlayer> m_player;
|
| - Animation* m_animation;
|
| - OwnPtrWillBePersistent<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > m_interpolations;
|
| + RefPtrWillBeWeakMember<AnimationPlayer> m_player;
|
| + RawPtrWillBeWeakMember<Animation> m_animation;
|
| + OwnPtrWillBeMember<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > m_interpolations;
|
| AnimationPlayer::SortInfo m_playerSortInfo;
|
| Animation::Priority m_priority;
|
| };
|
|
|