Use ShadowData in DropShadowFilterOperation

third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 240 matching lines @@
         break;
       }
       case FilterOperation::BLUR: {
         float stdDeviation = floatValueForLength(
             toBlurFilterOperation(filterOperation)->stdDeviation(), 0);
         effect =
             FEGaussianBlur::create(parentFilter, stdDeviation, stdDeviation);
         break;
       }
       case FilterOperation::DROP_SHADOW: {
-        DropShadowFilterOperation* dropShadowOperation =
-            toDropShadowFilterOperation(filterOperation);
-        float stdDeviation = dropShadowOperation->stdDeviation();
-        float x = dropShadowOperation->x();
-        float y = dropShadowOperation->y();
-        effect = FEDropShadow::create(parentFilter, stdDeviation, stdDeviation,
-                                      x, y, dropShadowOperation->getColor(), 1);
+        const ShadowData& shadow =
+            toDropShadowFilterOperation(*filterOperation).shadow();
+        effect = FEDropShadow::create(parentFilter, shadow.blur(),
+                                      shadow.blur(), shadow.x(), shadow.y(),
+                                      shadow.color().getColor(), 1);
         break;
       }
       case FilterOperation::BOX_REFLECT: {
         BoxReflectFilterOperation* boxReflectOperation =
             toBoxReflectFilterOperation(filterOperation);
         effect = FEBoxReflect::create(parentFilter,
                                       boxReflectOperation->reflection());
         break;
       }
       default:
@@ skipping 86 matching lines @@
         }
         break;
       }
       case FilterOperation::BLUR: {
         float pixelRadius =
             toBlurFilterOperation(*op).stdDeviation().getFloatValue();
         filters.appendBlurFilter(pixelRadius);
         break;
       }
       case FilterOperation::DROP_SHADOW: {
-        const DropShadowFilterOperation& drop =
-            toDropShadowFilterOperation(*op);
-        filters.appendDropShadowFilter(WebPoint(drop.x(), drop.y()),
-                                       drop.stdDeviation(),
-                                       drop.getColor().rgb());
+        const ShadowData& shadow = toDropShadowFilterOperation(*op).shadow();
+        filters.appendDropShadowFilter(WebPoint(shadow.x(), shadow.y()),
+                                       shadow.blur(),
+                                       shadow.color().getColor());
         break;
       }
       case FilterOperation::BOX_REFLECT: {
         // TODO(jbroman): Consider explaining box reflect to the compositor,
         // instead of calling this a "reference filter".
         const auto& reflection = toBoxReflectFilterOperation(*op).reflection();
         filters.appendReferenceFilter(
             SkiaImageFilterBuilder::buildBoxReflectFilter(reflection, nullptr));
         break;
       }
@@ skipping 44 matching lines @@
       Filter::create(m_referenceBox, filterRegion, m_zoom, unitScaling);
   if (!previousEffect)
     previousEffect = result->getSourceGraphic();
   SVGFilterBuilder builder(previousEffect, nodeMap, m_fillPaint, m_strokePaint);
   builder.buildGraph(result, filterElement, m_referenceBox);
   result->setLastEffect(builder.lastEffect());
   return result;
 }
 
 }  // namespace blink