Source/core/animation/LengthStyleInterpolation.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/LengthStyleInterpolation.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

« Source/core/animation/LengthPairStyleInterpolation.cpp ('K') | « Source/core/animation/LengthStyleInterpolation.h ('k') | Source/core/animation/LengthStyleInterpolationTest.cpp » ('j') | Source/core/animation/ListStyleInterpolation.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/LengthStyleInterpolation.cpp

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

index 27794a6609a7cffab5c244cb32d71943dbf7c182..effaf43168f31f34598aba819483a4db8969647f 100644

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

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

@@ -24,7 +24,7 @@ bool LengthStyleInterpolation::canCreateFrom(const CSSValue& value)

return value.isCalcValue();

}

-PassOwnPtrWillBeRawPtr<InterpolableValue> LengthStyleInterpolation::lengthToInterpolableValue(const CSSValue& value)

+PassOwnPtrWillBeRawPtr<InterpolableValue> LengthStyleInterpolation::toInterpolableValue(const CSSValue& value)

{

ASSERT(canCreateFrom(value));

OwnPtrWillBeRawPtr<InterpolableList> listOfValuesAndTypes = InterpolableList::create(2);

@@ -81,9 +81,9 @@ static PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> constructCalcExpression(Pas

}

-PassRefPtrWillBeRawPtr<CSSPrimitiveValue> LengthStyleInterpolation::interpolableValueToLength(const InterpolableValue* value, InterpolationRange range)

+PassRefPtrWillBeRawPtr<CSSPrimitiveValue> LengthStyleInterpolation::fromInterpolableValue(const InterpolableValue& value, InterpolationRange range)

{

- const InterpolableList* listOfValuesAndTypes = toInterpolableList(value);

+ const InterpolableList* listOfValuesAndTypes = toInterpolableList(&value);

const InterpolableList* listOfValues = toInterpolableList(listOfValuesAndTypes->get(0));

const InterpolableList* listOfTypes = toInterpolableList(listOfValuesAndTypes->get(1));

unsigned unitTypeCount = 0;

@@ -117,7 +117,7 @@ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> LengthStyleInterpolation::interpolable

void LengthStyleInterpolation::apply(StyleResolverState& state) const

{

- StyleBuilder::applyProperty(m_id, state, interpolableValueToLength(m_cachedValue.get(), m_range).get());

+ StyleBuilder::applyProperty(m_id, state, fromInterpolableValue(*m_cachedValue.get(), m_range).get());

}

void LengthStyleInterpolation::trace(Visitor* visitor)