| Index: Source/core/animation/InterpolationEffect.h
|
| diff --git a/Source/core/animation/InterpolationEffect.h b/Source/core/animation/InterpolationEffect.h
|
| index 76fdd3cf8efe025b7f90f955ba6ee03de5ee7839..c8137850b1ebb2b0a9f6bbf8015075e99b559830 100644
|
| --- a/Source/core/animation/InterpolationEffect.h
|
| +++ b/Source/core/animation/InterpolationEffect.h
|
| @@ -15,16 +15,16 @@
|
|
|
| namespace blink {
|
|
|
| -class CORE_EXPORT InterpolationEffect : public RefCountedWillBeGarbageCollected<InterpolationEffect> {
|
| +class CORE_EXPORT InterpolationEffect : public GarbageCollected<InterpolationEffect> {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<InterpolationEffect> create()
|
| + static InterpolationEffect* create()
|
| {
|
| - return adoptRefWillBeNoop(new InterpolationEffect());
|
| + return new InterpolationEffect();
|
| }
|
|
|
| - void getActiveInterpolations(double fraction, double iterationDuration, OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>>&) const;
|
| + void getActiveInterpolations(double fraction, double iterationDuration, HeapVector<Member<Interpolation>>*&) const;
|
|
|
| - void addInterpolation(PassRefPtrWillBeRawPtr<Interpolation> interpolation, PassRefPtr<TimingFunction> easing, double start, double end, double applyFrom, double applyTo)
|
| + void addInterpolation(Interpolation* interpolation, PassRefPtr<TimingFunction> easing, double start, double end, double applyFrom, double applyTo)
|
| {
|
| m_interpolations.append(InterpolationRecord::create(interpolation, easing, start, end, applyFrom, applyTo));
|
| }
|
| @@ -45,24 +45,24 @@ private:
|
| {
|
| }
|
|
|
| - class InterpolationRecord : public NoBaseWillBeGarbageCollectedFinalized<InterpolationRecord> {
|
| + class InterpolationRecord : public GarbageCollectedFinalized<InterpolationRecord> {
|
| public:
|
| - RefPtrWillBeMember<Interpolation> m_interpolation;
|
| + Member<Interpolation> m_interpolation;
|
| RefPtr<TimingFunction> m_easing;
|
| double m_start;
|
| double m_end;
|
| double m_applyFrom;
|
| double m_applyTo;
|
|
|
| - static PassOwnPtrWillBeRawPtr<InterpolationRecord> create(PassRefPtrWillBeRawPtr<Interpolation> interpolation, PassRefPtr<TimingFunction> easing, double start, double end, double applyFrom, double applyTo)
|
| + static InterpolationRecord* create(Interpolation* interpolation, PassRefPtr<TimingFunction> easing, double start, double end, double applyFrom, double applyTo)
|
| {
|
| - return adoptPtrWillBeNoop(new InterpolationRecord(interpolation, easing, start, end, applyFrom, applyTo));
|
| + return new InterpolationRecord(interpolation, easing, start, end, applyFrom, applyTo);
|
| }
|
|
|
| DECLARE_TRACE();
|
|
|
| private:
|
| - InterpolationRecord(PassRefPtrWillBeRawPtr<Interpolation> interpolation, PassRefPtr<TimingFunction> easing, double start, double end, double applyFrom, double applyTo)
|
| + InterpolationRecord(Interpolation* interpolation, PassRefPtr<TimingFunction> easing, double start, double end, double applyFrom, double applyTo)
|
| : m_interpolation(interpolation)
|
| , m_easing(easing)
|
| , m_start(start)
|
| @@ -73,7 +73,7 @@ private:
|
| }
|
| };
|
|
|
| - WillBeHeapVector<OwnPtrWillBeMember<InterpolationRecord>> m_interpolations;
|
| + HeapVector<Member<InterpolationRecord>> m_interpolations;
|
| };
|
|
|
| } // namespace blink
|
|
|