Index: Source/core/animation/InterpolationEffect.cpp |
diff --git a/Source/core/animation/InterpolationEffect.cpp b/Source/core/animation/InterpolationEffect.cpp |
index 549ac70d04b8d5854307f070ec5a0a76cbbbc62a..b6341c76458b2a730b1cdb151be278dedcbd19f8 100644 |
--- a/Source/core/animation/InterpolationEffect.cpp |
+++ b/Source/core/animation/InterpolationEffect.cpp |
@@ -7,17 +7,17 @@ |
namespace blink { |
-void InterpolationEffect::getActiveInterpolations(double fraction, double iterationDuration, OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>>& result) const |
+void InterpolationEffect::getActiveInterpolations(double fraction, double iterationDuration, OwnPtr<Vector<RefPtr<Interpolation>>>& result) const |
{ |
if (!result) |
- result = adoptPtrWillBeNoop(new WillBeHeapVector<RefPtrWillBeMember<Interpolation>>()); |
+ result = adoptPtr(new Vector<RefPtr<Interpolation>>()); |
size_t existingSize = result->size(); |
size_t resultIndex = 0; |
for (const auto& record : m_interpolations) { |
if (fraction >= record->m_applyFrom && fraction < record->m_applyTo) { |
- RefPtrWillBeRawPtr<Interpolation> interpolation = record->m_interpolation; |
+ RefPtr<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)); |
@@ -34,13 +34,13 @@ void InterpolationEffect::getActiveInterpolations(double fraction, double iterat |
void InterpolationEffect::addInterpolationsFromKeyframes(PropertyHandle property, Element* element, const ComputedStyle* baseStyle, Keyframe::PropertySpecificKeyframe& keyframeA, Keyframe::PropertySpecificKeyframe& keyframeB, double applyFrom, double applyTo) |
{ |
- RefPtrWillBeRawPtr<Interpolation> interpolation = keyframeA.maybeCreateInterpolation(property, keyframeB, element, baseStyle); |
+ RefPtr<Interpolation> interpolation = keyframeA.maybeCreateInterpolation(property, keyframeB, element, baseStyle); |
if (interpolation) { |
addInterpolation(interpolation, &keyframeA.easing(), keyframeA.offset(), keyframeB.offset(), applyFrom, applyTo); |
} else { |
- RefPtrWillBeRawPtr<Interpolation> interpolationA = keyframeA.maybeCreateInterpolation(property, keyframeA, element, baseStyle); |
- RefPtrWillBeRawPtr<Interpolation> interpolationB = keyframeB.maybeCreateInterpolation(property, keyframeB, element, baseStyle); |
+ RefPtr<Interpolation> interpolationA = keyframeA.maybeCreateInterpolation(property, keyframeA, element, baseStyle); |
+ RefPtr<Interpolation> interpolationB = keyframeB.maybeCreateInterpolation(property, keyframeB, element, baseStyle); |
Vector<TimingFunction::PartitionRegion> regions = Vector<TimingFunction::PartitionRegion>(); |
keyframeA.easing().partition(regions); |
@@ -72,14 +72,4 @@ void InterpolationEffect::addInterpolationsFromKeyframes(PropertyHandle property |
} |
} |
-DEFINE_TRACE(InterpolationEffect::InterpolationRecord) |
-{ |
- visitor->trace(m_interpolation); |
-} |
- |
-DEFINE_TRACE(InterpolationEffect) |
-{ |
- visitor->trace(m_interpolations); |
-} |
- |
} // namespace blink |