Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(486)

Unified Diff: Source/core/animation/SampledEffect.h

Issue 225073004: Oilpan: Completely move core/animations/ to oilpan's heap (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/animation/SampledEffect.h
diff --git a/Source/core/animation/SampledEffect.h b/Source/core/animation/SampledEffect.h
index 3958636cf922d08834fb88f10ceecca9e75c64af..5292e16043a3717d9da10a7e45f850bc75df1f7d 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();
dstockwell 2014/05/01 14:06:54 'attach/detach' is actually terminology we use in
haraken 2014/05/04 15:31:47 Done. Renamed it back to clear().
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;
+ RefPtrWillBeMember<AnimationPlayer> m_player;
+ RawPtrWillBeMember<Animation> m_animation;
haraken 2014/04/29 04:47:35 Conceptually m_player and m_animation are weak mem
Mads Ager (chromium) 2014/04/29 10:29:41 There is a mismatch between the comment and the co
dstockwell 2014/05/01 14:06:54 The explicit clearing was to make up for not havin
haraken 2014/05/04 15:31:47 You're right. I made these pointers weak members.
+ OwnPtrWillBeMember<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > m_interpolations;
AnimationPlayer::SortInfo m_playerSortInfo;
Animation::Priority m_priority;
};

Powered by Google App Engine
This is Rietveld 408576698