Source/core/animation/LengthPairStyleInterpolation.cpp - Issue 851633002: Animation: Add template for ListStyleInterpolation

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/animation/LengthPairStyleInterpolation.cpp

Issue 851633002: Animation: Add template for ListStyleInterpolation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 11 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/LengthBoxStyleInterpolation.cpp ('k') | Source/core/animation/LengthPoint3DStyleInterpolation.h » ('j') | Source/core/animation/ListStyleInterpolation.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/LengthPairStyleInterpolation.cpp

diff --git a/Source/core/animation/LengthPairStyleInterpolation.cpp b/Source/core/animation/LengthPairStyleInterpolation.cpp

index b9c71a064f48bd3377087dad12efca80fd9d1f8b..5f6a428f714f0c300d3d2c31450d77c74a621eed 100644

--- a/Source/core/animation/LengthPairStyleInterpolation.cpp

+++ b/Source/core/animation/LengthPairStyleInterpolation.cpp

@@ -22,16 +22,16 @@ PassOwnPtrWillBeRawPtr<InterpolableValue> LengthPairStyleInterpolation::lengthPa

Pair* pair = toCSSPrimitiveValue(value).getPairValue();

ASSERT(pair);

- result->set(0, LengthStyleInterpolation::lengthToInterpolableValue(*pair->first()));

- result->set(1, LengthStyleInterpolation::lengthToInterpolableValue(*pair->second()));

+ result->set(0, LengthStyleInterpolation::toInterpolableValue(*pair->first()));

+ result->set(1, LengthStyleInterpolation::toInterpolableValue(*pair->second()));

return result.release();

}

PassRefPtrWillBeRawPtr<CSSValue> LengthPairStyleInterpolation::interpolableValueToLengthPair(InterpolableValue* value, InterpolationRange range)

{

InterpolableList* lengthPair = toInterpolableList(value);

- RefPtrWillBeRawPtr<CSSPrimitiveValue> first = (LengthStyleInterpolation::interpolableValueToLength(lengthPair->get(0), range));

- RefPtrWillBeRawPtr<CSSPrimitiveValue> second = (LengthStyleInterpolation::interpolableValueToLength(lengthPair->get(1), range));

+ RefPtrWillBeRawPtr<CSSPrimitiveValue> first = (LengthStyleInterpolation::fromInterpolableValue(*lengthPair->get(0), range));

dstockwell 2015/01/30 04:24:01 remove outer parens

evemj (not active) 2015/02/02 03:56:02 Done.

+ RefPtrWillBeRawPtr<CSSPrimitiveValue> second = (LengthStyleInterpolation::fromInterpolableValue(*lengthPair->get(1), range));

RefPtrWillBeRawPtr<Pair> result = Pair::create(first, second, Pair::KeepIdenticalValues);

return CSSPrimitiveValue::create(result.release());