Index: Source/core/animation/InterpolationEffect.cpp |
diff --git a/Source/core/animation/InterpolationEffect.cpp b/Source/core/animation/InterpolationEffect.cpp |
index c8b41bf7eac6871b4dafa51c520fa8bcd30a6c04..628515b5213c679195cbf5b1e9d5f7bd7a573d54 100644 |
--- a/Source/core/animation/InterpolationEffect.cpp |
+++ b/Source/core/animation/InterpolationEffect.cpp |
@@ -7,15 +7,15 @@ |
namespace WebCore { |
-PassOwnPtr<Vector<RefPtr<Interpolation> > > InterpolationEffect::getActiveInterpolations(double fraction, double iterationDuration) const |
+PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > InterpolationEffect::getActiveInterpolations(double fraction, double iterationDuration) const |
{ |
- Vector<RefPtr<Interpolation> >* result = new Vector<RefPtr<Interpolation> >(); |
+ WillBeHeapVector<RefPtrWillBeMember<Interpolation> >* result = new WillBeHeapVector<RefPtrWillBeMember<Interpolation> >(); |
for (size_t i = 0; i < m_interpolations.size(); ++i) { |
const InterpolationRecord* record = m_interpolations[i].get(); |
if (fraction >= record->m_applyFrom && fraction < record->m_applyTo) { |
- RefPtr<Interpolation> interpolation = record->m_interpolation; |
+ RefPtrWillBeRawPtr<Interpolation> interpolation = record->m_interpolation; |
double localFraction = (fraction - record->m_start) / (record->m_end - record->m_start); |
if (record->m_easing) |
localFraction = record->m_easing->evaluate(localFraction, accuracyForDuration(iterationDuration)); |
@@ -24,7 +24,12 @@ PassOwnPtr<Vector<RefPtr<Interpolation> > > InterpolationEffect::getActiveInterp |
} |
} |
- return adoptPtr(result); |
+ return adoptPtrWillBeNoop(result); |
+} |
+ |
+void InterpolationEffect::InterpolationRecord::trace(Visitor* visitor) |
+{ |
+ visitor->trace(m_interpolation); |
} |
} |