| Index: third_party/WebKit/Source/core/animation/FilterInterpolationFunctions.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/FilterInterpolationFunctions.cpp b/third_party/WebKit/Source/core/animation/FilterInterpolationFunctions.cpp
|
| index 29b7fb5b06c0d4535881c0f782d811d62a1573b6..32e530295174c85a26613fa816724b3e7b7545bf 100644
|
| --- a/third_party/WebKit/Source/core/animation/FilterInterpolationFunctions.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/FilterInterpolationFunctions.cpp
|
| @@ -187,12 +187,8 @@ InterpolationValue FilterInterpolationFunctions::maybeConvertFilter(
|
| break;
|
|
|
| case FilterOperation::DROP_SHADOW: {
|
| - const DropShadowFilterOperation& blurFilter =
|
| - toDropShadowFilterOperation(filter);
|
| - ShadowData shadowData(blurFilter.location(), blurFilter.stdDeviation(), 0,
|
| - Normal, blurFilter.getColor());
|
| - result =
|
| - ShadowInterpolationFunctions::convertShadowData(shadowData, zoom);
|
| + result = ShadowInterpolationFunctions::convertShadowData(
|
| + toDropShadowFilterOperation(filter).shadow(), zoom);
|
| break;
|
| }
|
|
|
| @@ -285,11 +281,9 @@ FilterOperation* FilterInterpolationFunctions::createFilter(
|
| ShadowData shadowData = ShadowInterpolationFunctions::createShadowData(
|
| interpolableValue, nonInterpolableValue.typeNonInterpolableValue(),
|
| state);
|
| - Color color = shadowData.color().isCurrentColor()
|
| - ? Color::black
|
| - : shadowData.color().getColor();
|
| - return DropShadowFilterOperation::create(
|
| - IntPoint(shadowData.x(), shadowData.y()), shadowData.blur(), color);
|
| + if (shadowData.color().isCurrentColor())
|
| + shadowData.overrideColor(Color::black);
|
| + return DropShadowFilterOperation::create(shadowData);
|
| }
|
|
|
| default:
|
|
|