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

Unified Diff: Source/core/animation/animatable/AnimatableRepeatable.cpp

Issue 1276183004: Oilpan: Unship oilpan from temporary animation objects (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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/animatable/AnimatableRepeatable.cpp
diff --git a/Source/core/animation/animatable/AnimatableRepeatable.cpp b/Source/core/animation/animatable/AnimatableRepeatable.cpp
index d16951f476aeb76c6054c8cc7a077c58bf118d11..ce3ed4f86f4f0bdec2ff0869c2d06b4def1280b4 100644
--- a/Source/core/animation/animatable/AnimatableRepeatable.cpp
+++ b/Source/core/animation/animatable/AnimatableRepeatable.cpp
@@ -37,8 +37,8 @@ namespace blink {
bool AnimatableRepeatable::usesDefaultInterpolationWith(const AnimatableValue* value) const
{
- const WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& fromValues = m_values;
- const WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& toValues = toAnimatableRepeatable(value)->m_values;
+ const Vector<RefPtr<AnimatableValue>>& fromValues = m_values;
+ const Vector<RefPtr<AnimatableValue>>& toValues = toAnimatableRepeatable(value)->m_values;
ASSERT(!fromValues.isEmpty() && !toValues.isEmpty());
size_t size = lowestCommonMultiple(fromValues.size(), toValues.size());
ASSERT(size > 0);
@@ -52,7 +52,7 @@ bool AnimatableRepeatable::usesDefaultInterpolationWith(const AnimatableValue* v
return false;
}
-bool AnimatableRepeatable::interpolateLists(const WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& fromValues, const WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& toValues, double fraction, WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& interpolatedValues)
+bool AnimatableRepeatable::interpolateLists(const Vector<RefPtr<AnimatableValue>>& fromValues, const Vector<RefPtr<AnimatableValue>>& toValues, double fraction, Vector<RefPtr<AnimatableValue>>& interpolatedValues)
{
// Interpolation behaviour spec: http://www.w3.org/TR/css3-transitions/#animtype-repeatable-list
ASSERT(interpolatedValues.isEmpty());
@@ -70,9 +70,9 @@ bool AnimatableRepeatable::interpolateLists(const WillBeHeapVector<RefPtrWillBeM
return true;
}
-PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableRepeatable::interpolateTo(const AnimatableValue* value, double fraction) const
+PassRefPtr<AnimatableValue> AnimatableRepeatable::interpolateTo(const AnimatableValue* value, double fraction) const
{
- WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>> interpolatedValues;
+ Vector<RefPtr<AnimatableValue>> interpolatedValues;
bool success = interpolateLists(m_values, toAnimatableRepeatable(value)->m_values, fraction, interpolatedValues);
if (success)
return create(interpolatedValues);
@@ -81,7 +81,7 @@ PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableRepeatable::interpolateTo(cons
bool AnimatableRepeatable::equalTo(const AnimatableValue* value) const
{
- const WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& otherValues = toAnimatableRepeatable(value)->m_values;
+ const Vector<RefPtr<AnimatableValue>>& otherValues = toAnimatableRepeatable(value)->m_values;
if (m_values.size() != otherValues.size())
return false;
for (size_t i = 0; i < m_values.size(); ++i) {
@@ -91,10 +91,4 @@ bool AnimatableRepeatable::equalTo(const AnimatableValue* value) const
return true;
}
-DEFINE_TRACE(AnimatableRepeatable)
-{
- visitor->trace(m_values);
- AnimatableValue::trace(visitor);
-}
-
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698