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

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: Rebase Created 5 years, 4 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 3ed129d17ddceee4b3630d6fae24833b2912b8c0..f043c328ae1fba7a88499e7c6bdc1dac650aa5d8 100644
--- a/Source/core/animation/SampledEffect.h
+++ b/Source/core/animation/SampledEffect.h
@@ -16,25 +16,21 @@ namespace blink {
class SVGElement;
-class SampledEffect : public NoBaseWillBeGarbageCollected<SampledEffect> {
- WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(SampledEffect);
+class SampledEffect : public GarbageCollectedFinalized<SampledEffect> {
WTF_MAKE_NONCOPYABLE(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; }
- 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; }
@@ -45,11 +41,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;
};
« no previous file with comments | « Source/core/animation/SVGStrokeDasharrayStyleInterpolationTest.cpp ('k') | Source/core/animation/SampledEffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698