Handle interpolation of SVG <paint> 'currentColor' w/ Web/CSS Animations

Source/core/animation/css/CSSAnimatableValueFactory.cpp

 /*
  * 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:
  *
  *     * 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
@@ skipping 257 matching lines @@
 
     ASSERT_NOT_REACHED();
     return 400;
 }
 
 static PassRefPtrWillBeRawPtr<AnimatableValue> createFromFontWeight(FontWeight fontWeight)
 {
     return createFromDouble(fontWeightToDouble(fontWeight));
 }
 
+static SVGPaintType normalizeSVGPaintType(SVGPaintType paintType)
+{
+    // If the <paint> is 'currentColor', then create an AnimatableSVGPaint with
+    // a <rgbcolor> type. This is similar in vein to the handling of colors.
+    return paintType == SVG_PAINTTYPE_CURRENTCOLOR ? SVG_PAINTTYPE_RGBCOLOR : paintType;
+}
+
 // FIXME: Generate this function.
 PassRefPtrWillBeRawPtr<AnimatableValue> CSSAnimatableValueFactory::create(CSSPropertyID property, const RenderStyle& style)
 {
     ASSERT(CSSPropertyMetadata::isAnimatableProperty(property));
     switch (property) {
     case CSSPropertyBackgroundColor:
         return createFromColor(property, style);
     case CSSPropertyBackgroundImage:
         return createFromFillLayers<CSSPropertyBackgroundImage>(style.backgroundLayers(), style);
     case CSSPropertyBackgroundPositionX:
@@ skipping 45 matching lines @@
     case CSSPropertyClip:
         if (style.hasAutoClip())
             return AnimatableUnknown::create(CSSPrimitiveValue::create(CSSValueAuto));
         return createFromLengthBox(style.clip(), style);
     case CSSPropertyColor:
         return createFromColor(property, style);
     case CSSPropertyFillOpacity:
         return createFromDouble(style.fillOpacity());
     case CSSPropertyFill:
         return AnimatableSVGPaint::create(
-            style.svgStyle().fillPaintType(), style.svgStyle().visitedLinkFillPaintType(),
+            normalizeSVGPaintType(style.svgStyle().fillPaintType()), normalizeSVGPaintType(style.svgStyle().visitedLinkFillPaintType()),
             style.svgStyle().fillPaintColor(), style.svgStyle().visitedLinkFillPaintColor(),
             style.svgStyle().fillPaintUri(), style.svgStyle().visitedLinkFillPaintUri());
     case CSSPropertyFlexGrow:
         return createFromDouble(style.flexGrow(), AnimatableDouble::InterpolationIsNonContinuousWithZero);
     case CSSPropertyFlexShrink:
         return createFromDouble(style.flexShrink(), AnimatableDouble::InterpolationIsNonContinuousWithZero);
     case CSSPropertyFlexBasis:
         return createFromLength(style.flexBasis(), style);
     case CSSPropertyFloodColor:
         return createFromColor(property, style);
@@ skipping 68 matching lines @@
     case CSSPropertyStrokeDasharray:
         return AnimatableStrokeDasharrayList::create(style.strokeDashArray());
     case CSSPropertyStrokeDashoffset:
         return AnimatableSVGLength::create(style.strokeDashOffset());
     case CSSPropertyStrokeMiterlimit:
         return createFromDouble(style.strokeMiterLimit());
     case CSSPropertyStrokeOpacity:
         return createFromDouble(style.strokeOpacity());
     case CSSPropertyStroke:
         return AnimatableSVGPaint::create(
-            style.svgStyle().strokePaintType(), style.svgStyle().visitedLinkStrokePaintType(),
+            normalizeSVGPaintType(style.svgStyle().strokePaintType()), normalizeSVGPaintType(style.svgStyle().visitedLinkStrokePaintType()),
             style.svgStyle().strokePaintColor(), style.svgStyle().visitedLinkStrokePaintColor(),
             style.svgStyle().strokePaintUri(), style.svgStyle().visitedLinkStrokePaintUri());
     case CSSPropertyTextDecorationColor:
         return createFromColor(property, style);
     case CSSPropertyTextIndent:
         return createFromLength(style.textIndent(), style);
     case CSSPropertyTextShadow:
         return AnimatableShadow::create(style.textShadow());
     case CSSPropertyTop:
         return createFromLength(style.top(), style);
@@ skipping 66 matching lines @@
     case CSSPropertyZoom:
         return createFromDouble(style.zoom());
     default:
         ASSERT_NOT_REACHED();
         // This return value is to avoid a release crash if possible.
         return AnimatableUnknown::create(nullptr);
     }
 }
 
 } // namespace blink