| Index: third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp
|
| index 354133138d7460c0216e3a09adfc3f5889b90191..0e10f90c211f043aa83a413449ba61565b869798 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp
|
| @@ -165,10 +165,10 @@ void CSSImageListInterpolationType::composite(
|
| underlyingValueOwner.set(*this, value);
|
| }
|
|
|
| -void CSSImageListInterpolationType::apply(
|
| +void CSSImageListInterpolationType::applyStandardPropertyValue(
|
| const InterpolableValue& interpolableValue,
|
| const NonInterpolableValue* nonInterpolableValue,
|
| - InterpolationEnvironment& environment) const {
|
| + StyleResolverState& state) const {
|
| const InterpolableList& interpolableList =
|
| toInterpolableList(interpolableValue);
|
| const size_t length = interpolableList.length();
|
| @@ -177,12 +177,13 @@ void CSSImageListInterpolationType::apply(
|
| toNonInterpolableList(*nonInterpolableValue);
|
| DCHECK_EQ(nonInterpolableList.length(), length);
|
| StyleImageList imageList(length);
|
| - for (size_t i = 0; i < length; i++)
|
| + for (size_t i = 0; i < length; i++) {
|
| imageList[i] = CSSImageInterpolationType::resolveStyleImage(
|
| cssProperty(), *interpolableList.get(i), nonInterpolableList.get(i),
|
| - environment.state());
|
| - ImageListPropertyFunctions::setImageList(
|
| - cssProperty(), *environment.state().style(), imageList);
|
| + state);
|
| + }
|
| + ImageListPropertyFunctions::setImageList(cssProperty(), *state.style(),
|
| + imageList);
|
| }
|
|
|
| } // namespace blink
|
|
|