Source/core/animation/animatable/AnimatableRepeatable.cpp - Issue 984153002: Fix template angle bracket syntax in animation

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

Issue 984153002: Fix template angle bracket syntax in animation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 9 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

« no previous file with comments | « Source/core/animation/animatable/AnimatableRepeatable.h ('k') | Source/core/animation/animatable/AnimatableStrokeDasharrayList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/animatable/AnimatableRepeatable.cpp

diff --git a/Source/core/animation/animatable/AnimatableRepeatable.cpp b/Source/core/animation/animatable/AnimatableRepeatable.cpp

index c6b1efa21168874628bde4627d047cdb5b9a6eb6..d16951f476aeb76c6054c8cc7a077c58bf118d11 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 WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& fromValues = m_values;

+ const WillBeHeapVector<RefPtrWillBeMember<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 WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& fromValues, const WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& toValues, double fraction, WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& interpolatedValues)

{

// Interpolation behaviour spec: http://www.w3.org/TR/css3-transitions/#animtype-repeatable-list

ASSERT(interpolatedValues.isEmpty());

@@ -72,7 +72,7 @@ bool AnimatableRepeatable::interpolateLists(const WillBeHeapVector<RefPtrWillBeM

PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableRepeatable::interpolateTo(const AnimatableValue* value, double fraction) const

{

- WillBeHeapVector<RefPtrWillBeMember<AnimatableValue> > interpolatedValues;

+ WillBeHeapVector<RefPtrWillBeMember<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 WillBeHeapVector<RefPtrWillBeMember<AnimatableValue>>& otherValues = toAnimatableRepeatable(value)->m_values;

if (m_values.size() != otherValues.size())

return false;

for (size_t i = 0; i < m_values.size(); ++i) {