Use ShadowData in DropShadowFilterOperation

third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 980 matching lines @@
 LengthSize StyleBuilderConverter::convertRadius(StyleResolverState& state,
                                                 const CSSValue& value) {
   const CSSValuePair& pair = toCSSValuePair(value);
   Length radiusWidth = toCSSPrimitiveValue(pair.first())
                            .convertToLength(state.cssToLengthConversionData());
   Length radiusHeight = toCSSPrimitiveValue(pair.second())
                             .convertToLength(state.cssToLengthConversionData());
   return LengthSize(radiusWidth, radiusHeight);
 }
 
-PassRefPtr<ShadowList> StyleBuilderConverter::convertShadow(
+ShadowData StyleBuilderConverter::convertShadow(StyleResolverState& state,
+                                                const CSSValue& value) {
+  const CSSShadowValue& shadow = toCSSShadowValue(value);
+  float x = shadow.x->computeLength<float>(state.cssToLengthConversionData());
+  float y = shadow.y->computeLength<float>(state.cssToLengthConversionData());
+  float blur =
+      shadow.blur
+          ? shadow.blur->computeLength<float>(state.cssToLengthConversionData())
+          : 0;
+  float spread = shadow.spread
+                     ? shadow.spread->computeLength<float>(
+                           state.cssToLengthConversionData())
+                     : 0;
+  ShadowStyle shadowStyle =
+      shadow.style && shadow.style->getValueID() == CSSValueInset ? Inset
+                                                                  : Normal;
+  StyleColor color = StyleColor::currentColor();
+  if (shadow.color)
+    color = convertStyleColor(state, *shadow.color);
+  return ShadowData(FloatPoint(x, y), blur, spread, shadowStyle, color);
+}
+
+PassRefPtr<ShadowList> StyleBuilderConverter::convertShadowList(
     StyleResolverState& state,
     const CSSValue& value) {
   if (value.isIdentifierValue()) {
     DCHECK_EQ(toCSSIdentifierValue(value).getValueID(), CSSValueNone);
     return PassRefPtr<ShadowList>();
   }
 
-  const CSSValueList& valueList = toCSSValueList(value);
-  size_t shadowCount = valueList.length();
   ShadowDataVector shadows;
-  for (size_t i = 0; i < shadowCount; ++i) {
-    const CSSShadowValue& item = toCSSShadowValue(valueList.item(i));
-    float x = item.x->computeLength<float>(state.cssToLengthConversionData());
-    float y = item.y->computeLength<float>(state.cssToLengthConversionData());
-    float blur =
-        item.blur
-            ? item.blur->computeLength<float>(state.cssToLengthConversionData())
-            : 0;
-    float spread = item.spread
-                       ? item.spread->computeLength<float>(
-                             state.cssToLengthConversionData())
-                       : 0;
-    ShadowStyle shadowStyle =
-        item.style && item.style->getValueID() == CSSValueInset ? Inset
-                                                                : Normal;
-    StyleColor color = StyleColor::currentColor();
-    if (item.color)
-      color = convertStyleColor(state, *item.color);
-    shadows.append(
-        ShadowData(FloatPoint(x, y), blur, spread, shadowStyle, color));
-  }
+  for (const auto& item : toCSSValueList(value))
+    shadows.append(convertShadow(state, *item));
+
   return ShadowList::adopt(shadows);
 }
 
 ShapeValue* StyleBuilderConverter::convertShapeValue(StyleResolverState& state,
                                                      const CSSValue& value) {
   if (value.isIdentifierValue()) {
     DCHECK_EQ(toCSSIdentifierValue(value).getValueID(), CSSValueNone);
     return nullptr;
   }
 
@@ skipping 252 matching lines @@
       // Instead of the actual zoom, use 1 to avoid potential rounding errors
       Length length = primitiveValue.convertToLength(
           state.cssToLengthConversionData().copyWithAdjustedZoom(1));
       return *CSSPrimitiveValue::create(length, 1);
     }
   }
   return value;
 }
 
 }  // namespace blink