Use ShadowData in DropShadowFilterOperation

third_party/WebKit/Source/core/animation/FilterInterpolationFunctions.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/animation/FilterInterpolationFunctions.h"
 
 #include "core/animation/LengthInterpolationFunctions.h"
 #include "core/animation/ShadowInterpolationFunctions.h"
 #include "core/css/CSSFunctionValue.h"
 #include "core/css/CSSPrimitiveValue.h"
@@ skipping 169 matching lines @@
       result.interpolableValue = InterpolableNumber::create(
           toBasicComponentTransferFilterOperation(filter).amount());
       break;
 
     case FilterOperation::BLUR:
       result = LengthInterpolationFunctions::maybeConvertLength(
           toBlurFilterOperation(filter).stdDeviation(), zoom);
       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;
     }
 
     case FilterOperation::REFERENCE:
       return nullptr;
 
     default:
       NOTREACHED();
       return nullptr;
   }
@@ skipping 72 matching lines @@
       Length stdDeviation = LengthInterpolationFunctions::createLength(
           interpolableValue, nonInterpolableValue.typeNonInterpolableValue(),
           state.cssToLengthConversionData(), ValueRangeNonNegative);
       return BlurFilterOperation::create(stdDeviation);
     }
 
     case FilterOperation::DROP_SHADOW: {
       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:
       NOTREACHED();
       return nullptr;
   }
 }
 
 }  // namespace blink