Index: Source/core/animation/SampledEffect.h |
diff --git a/Source/core/animation/SampledEffect.h b/Source/core/animation/SampledEffect.h |
index 3ed129d17ddceee4b3630d6fae24833b2912b8c0..1c1a6ec321d33bb6b29ba54a6d3f667e15e06cfa 100644 |
--- a/Source/core/animation/SampledEffect.h |
+++ b/Source/core/animation/SampledEffect.h |
@@ -16,13 +16,12 @@ namespace blink { |
class SVGElement; |
-class SampledEffect : public NoBaseWillBeGarbageCollected<SampledEffect> { |
- WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(SampledEffect); |
+class SampledEffect : public GarbageCollectedFinalized<SampledEffect> { |
alancutter (OOO until 2018)
2015/09/01 08:00:42
Not sure why this needs finalising.
sof
2015/09/01 08:13:06
The OwnPtrWillBeMember<> field brings that about -
haraken
2015/09/01 08:53:58
Added a TODO.
|
WTF_MAKE_NONCOPYABLE(SampledEffect); |
public: |
- static PassOwnPtrWillBeRawPtr<SampledEffect> create(KeyframeEffect* animation, PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> interpolations) |
+ static SampledEffect* create(KeyframeEffect* animation, PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> interpolations) |
{ |
- return adoptPtrWillBeNoop(new SampledEffect(animation, interpolations)); |
+ return new SampledEffect(animation, interpolations); |
} |
void clear(); |
@@ -47,8 +46,8 @@ public: |
private: |
SampledEffect(KeyframeEffect*, PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>>); |
- RawPtrWillBeWeakMember<KeyframeEffect> m_effect; |
- RefPtrWillBeMember<Animation> m_animation; |
+ WeakMember<KeyframeEffect> m_effect; |
+ Member<Animation> m_animation; |
OwnPtrWillBeMember<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> m_interpolations; |
const unsigned m_sequenceNumber; |
KeyframeEffect::Priority m_priority; |