Use ShadowData in DropShadowFilterOperation

third_party/WebKit/Source/core/style/FilterOperation.cpp

 /*
  * Copyright (C) 2011 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 156 matching lines @@
   if (!from)
     return BlurFilterOperation::create(m_stdDeviation.blend(
         Length(lengthType), progress, ValueRangeNonNegative));
 
   const BlurFilterOperation* fromOp = toBlurFilterOperation(from);
   return BlurFilterOperation::create(m_stdDeviation.blend(
       fromOp->m_stdDeviation, progress, ValueRangeNonNegative));
 }
 
 FloatRect DropShadowFilterOperation::mapRect(const FloatRect& rect) const {
-  float stdDeviation = m_stdDeviation;
+  float stdDeviation = m_shadow.blur();
   return FEDropShadow::mapEffect(FloatSize(stdDeviation, stdDeviation),
-                                 FloatPoint(m_location), rect);
+                                 m_shadow.location(), rect);
 }
 
 FilterOperation* DropShadowFilterOperation::blend(const FilterOperation* from,
                                                   double progress) const {
   if (!from) {
-    return DropShadowFilterOperation::create(
-        blink::blend(IntPoint(), m_location, progress),
-        blink::blend(0, m_stdDeviation, progress),
-        blink::blend(Color(Color::transparent), m_color, progress));
+    return create(m_shadow.blend(ShadowData::neutralValue(), progress,
+                                 Color::transparent));
   }
 
-  const DropShadowFilterOperation* fromOp = toDropShadowFilterOperation(from);
-  return DropShadowFilterOperation::create(
-      blink::blend(fromOp->location(), m_location, progress),
-      blink::blend(fromOp->stdDeviation(), m_stdDeviation, progress),
-      blink::blend(fromOp->getColor(), m_color, progress));
+  const auto& fromOp = toDropShadowFilterOperation(*from);
+  return create(m_shadow.blend(fromOp.m_shadow, progress, Color::transparent));
 }
 
 FloatRect BoxReflectFilterOperation::mapRect(const FloatRect& rect) const {
   return m_reflection.mapRect(rect);
 }
 
 FilterOperation* BoxReflectFilterOperation::blend(const FilterOperation* from,
                                                   double progress) const {
   NOTREACHED();
   return nullptr;
 }
 
 bool BoxReflectFilterOperation::operator==(const FilterOperation& o) const {
   if (!isSameType(o))
     return false;
   const auto& other = static_cast<const BoxReflectFilterOperation&>(o);
   return m_reflection == other.m_reflection;
 }
 
 }  // namespace blink