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

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

Issue 1120003002: [Oilpan] Migrate most classes under core/animations to Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 4 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..7c0b9b5388e1a520f23ef73fcc8dfee2dc9e7473 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 HeapVector<Member<AnimatableValue>>& fromValues = m_values;
+ const HeapVector<Member<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 HeapVector<Member<AnimatableValue>>& fromValues, const HeapVector<Member<AnimatableValue>>& toValues, double fraction, HeapVector<Member<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
+AnimatableValue* AnimatableRepeatable::interpolateTo(const AnimatableValue* value, double fraction) const
{
- WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>> interpolatedValues;
+ HeapVector<Member<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 HeapVector<Member<AnimatableValue>>& otherValues = toAnimatableRepeatable(value)->m_values;
if (m_values.size() != otherValues.size())
return false;
for (size_t i = 0; i < m_values.size(); ++i) {
« no previous file with comments | « Source/core/animation/animatable/AnimatableRepeatable.h ('k') | Source/core/animation/animatable/AnimatableSVGPaint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698