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

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

Issue 1120003002: [Oilpan] Migrate most classes under core/animations to Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Resize expect size of Persistent Created 5 years, 7 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 16e91c8adcf58906c3708d0d3a0cd173bbbabff0..f3389c8b060e4335d2acbc01916325b6dfd9e3a6 100644
--- a/Source/core/animation/SampledEffect.h
+++ b/Source/core/animation/SampledEffect.h
@@ -15,23 +15,20 @@ namespace blink {
class SVGElement;
-class SampledEffect : public NoBaseWillBeGarbageCollected<SampledEffect> {
+class SampledEffect : public GarbageCollectedFinalized<SampledEffect> {
public:
- static PassOwnPtrWillBeRawPtr<SampledEffect> create(KeyframeEffect* animation, PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> interpolations)
+ static SampledEffect* create(KeyframeEffect* animation, HeapVector<Member<Interpolation>>* interpolations)
{
- return adoptPtrWillBeNoop(new SampledEffect(animation, interpolations));
+ return new SampledEffect(animation, interpolations);
}
+ ~SampledEffect() { }
void clear();
- const WillBeHeapVector<RefPtrWillBeMember<Interpolation>>& interpolations() const { return *m_interpolations; }
-#if ENABLE(OILPAN)
- RawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> mutableInterpolations() { return m_interpolations.get(); }
-#else
- PassOwnPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> mutableInterpolations() { return m_interpolations.release(); }
-#endif
+ const HeapVector<Member<Interpolation>>& interpolations() const { return *m_interpolations; }
+ HeapVector<Member<Interpolation>>* mutableInterpolations() { return m_interpolations.get(); }
sof 2015/05/30 11:34:05 get() needed?
peria 2015/06/01 04:43:02 not needed.
peria 2015/06/01 04:43:02 Done.
- void setInterpolations(PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> interpolations) { m_interpolations = interpolations; }
+ void setInterpolations(HeapVector<Member<Interpolation>>* interpolations) { m_interpolations = interpolations; }
KeyframeEffect* effect() const { return m_effect; }
unsigned sequenceNumber() const { return m_sequenceNumber; }
@@ -42,11 +39,11 @@ public:
void applySVGUpdate(SVGElement&);
private:
- SampledEffect(KeyframeEffect*, PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>>);
+ SampledEffect(KeyframeEffect*, HeapVector<Member<Interpolation>>*);
- RawPtrWillBeWeakMember<KeyframeEffect> m_effect;
- RefPtrWillBeMember<Animation> m_animation;
- OwnPtrWillBeMember<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> m_interpolations;
+ WeakMember<KeyframeEffect> m_effect;
+ Member<Animation> m_animation;
+ Member<HeapVector<Member<Interpolation>>> m_interpolations;
const unsigned m_sequenceNumber;
KeyframeEffect::Priority m_priority;
};

Powered by Google App Engine
This is Rietveld 408576698