Fix animation of 'color' w/ currentColor for SVG 'fill' and 'stroke'

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
@@ skipping 150 matching lines @@
 }
 
 void StyleBuilderFunctions::applyValueCSSPropertyColor(StyleResolverState& state, CSSValue* value)
 {
     // As per the spec, 'color: currentColor' is treated as 'color: inherit'
     if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueCurrentcolor) {
         applyInheritCSSPropertyColor(state);
         return;
     }
 
-    if (state.applyPropertyToRegularStyle())
-        state.style()->setColor(StyleBuilderConverter::convertColor(state, *value));
-    if (state.applyPropertyToVisitedLinkStyle())
-        state.style()->setVisitedLinkColor(StyleBuilderConverter::convertColor(state, *value, true));
+    bool isFillCurrentColor = state.style()->svgStyle().isFillColorCurrentColor();
+    bool isStrokeCurrentColor = state.style()->svgStyle().isStrokeColorCurrentColor();
+
+    if (state.applyPropertyToRegularStyle()) {
+        if (!isFillCurrentColor && !isStrokeCurrentColor)
+            state.style()->setColor(StyleBuilderConverter::convertColor(state, *value));
+
+        if (isFillCurrentColor)
+            state.style()->setColor(state.style()->svgStyle().fillPaintColor());

[fs, 2015/11/27 08:50:25]

You shouldn't be overriding the value of 'color' like this. (This will break for
instance inheritance of the 'color' property.)

+        if (isStrokeCurrentColor)
+            state.style()->setColor(state.style()->svgStyle().strokePaintColor());
+    }
+
+    if (state.applyPropertyToVisitedLinkStyle()) {
+        if (!isFillCurrentColor && !isStrokeCurrentColor)
+            state.style()->setVisitedLinkColor(StyleBuilderConverter::convertColor(state, *value, true));
+
+        if (isFillCurrentColor)
+            state.style()->setColor(state.style()->svgStyle().visitedLinkFillPaintColor());
+        if (isStrokeCurrentColor)
+            state.style()->setColor(state.style()->svgStyle().visitedLinkStrokePaintColor());
+    }
 }
 
 void StyleBuilderFunctions::applyInitialCSSPropertyCursor(StyleResolverState& state)
 {
     state.style()->clearCursorList();
     state.style()->setCursor(ComputedStyle::initialCursor());
 }
 
 void StyleBuilderFunctions::applyInheritCSSPropertyCursor(StyleResolverState& state)
 {
@@ skipping 677 matching lines @@
         return;
     case CSSValueSuper:
         svgStyle.setBaselineShift(BS_SUPER);
         return;
     default:
         ASSERT_NOT_REACHED();
     }
 }
 
 } // namespace blink