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

third_party/WebKit/Source/core/style/SVGComputedStyle.h

 /*
     Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
                   2004, 2005 Rob Buis <buis@kde.org>
     Copyright (C) 2005, 2006 Apple Computer, Inc.
     Copyright (C) Research In Motion Limited 2010. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
@@ skipping 345 matching lines @@
     EPaintOrder paintOrder() const { return (EPaintOrder) svg_inherited_flags.paintOrder; }
     EPaintOrderType paintOrderType(unsigned index) const;
 
     const SVGPaintType& visitedLinkFillPaintType() const { return fill->visitedLinkPaintType; }
     const Color& visitedLinkFillPaintColor() const { return fill->visitedLinkPaintColor; }
     const String& visitedLinkFillPaintUri() const { return fill->visitedLinkPaintUri; }
     const SVGPaintType& visitedLinkStrokePaintType() const { return stroke->visitedLinkPaintType; }
     const Color& visitedLinkStrokePaintColor() const { return stroke->visitedLinkPaintColor; }
     const String& visitedLinkStrokePaintUri() const { return stroke->visitedLinkPaintUri; }
 
+    bool isFillColorCurrentColor() const
+    {
+        return fillPaintType() == SVG_PAINTTYPE_CURRENTCOLOR
+        || visitedLinkFillPaintType() == SVG_PAINTTYPE_CURRENTCOLOR

[fs, 2015/12/23 16:13:43]

Indent the three ||-lines one more step (4 more spaces).

+        || fillPaintType() == SVG_PAINTTYPE_URI_CURRENTCOLOR
+        || visitedLinkFillPaintType() == SVG_PAINTTYPE_URI_CURRENTCOLOR;
+    }
+
+    bool isStrokeColorCurrentColor() const
+    {
+        return strokePaintType() == SVG_PAINTTYPE_CURRENTCOLOR
+        || visitedLinkStrokePaintType() == SVG_PAINTTYPE_CURRENTCOLOR

[fs, 2015/12/23 16:13:43]

Ditto.

+        || strokePaintType() == SVG_PAINTTYPE_URI_CURRENTCOLOR
+        || visitedLinkStrokePaintType() == SVG_PAINTTYPE_URI_CURRENTCOLOR;
+    }
+
     // convenience
     bool hasClipper() const { return !clipperResource().isEmpty(); }
     bool hasMasker() const { return !maskerResource().isEmpty(); }
     bool hasFilter() const { return !filterResource().isEmpty(); }
     bool hasMarkers() const { return !markerStartResource().isEmpty() || !markerMidResource().isEmpty() || !markerEndResource().isEmpty(); }
     bool hasStroke() const { return strokePaintType() != SVG_PAINTTYPE_NONE; }
     bool hasVisibleStroke() const { return hasStroke() && !strokeWidth().isZero(); }
     bool hasSquareCapStyle() const { return capStyle() == SquareCap; }
     bool hasMiterJoinStyle() const { return joinStyle() == MiterJoin; }
     bool hasFill() const { return fillPaintType() != SVG_PAINTTYPE_NONE; }
@@ skipping 93 matching lines @@
         svg_noninherited_flags.f.baselineShift = initialBaselineShift();
         svg_noninherited_flags.f.vectorEffect = initialVectorEffect();
         svg_noninherited_flags.f.bufferedRendering = initialBufferedRendering();
         svg_noninherited_flags.f.maskType = initialMaskType();
     }
 };
 
 } // namespace blink
 
 #endif // SVGComputedStyle_h