Don't animate caret-color: auto

third_party/WebKit/Source/core/animation/ColorPropertyFunctions.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/animation/ColorPropertyFunctions.h"
 
 #include "core/style/ComputedStyle.h"
 
 namespace blink {
 
-bool ColorPropertyFunctions::getInitialColor(CSSPropertyID property,
-                                             StyleColor& initialColor) {
-  if (property == CSSPropertyCaretColor)
-    return false;
-  // TODO(rego): Make getUnvisitedColor() return a bool, so we don't need a
-  // special case for caret-color here (http://crbug.com/676295).
-  initialColor = getUnvisitedColor(property, ComputedStyle::initialStyle());
-  return true;
+OptionalStyleColor ColorPropertyFunctions::getInitialColor(
+    CSSPropertyID property) {
+  return getUnvisitedColor(property, ComputedStyle::initialStyle());
 }
 
-StyleColor ColorPropertyFunctions::getUnvisitedColor(
+OptionalStyleColor ColorPropertyFunctions::getUnvisitedColor(
     CSSPropertyID property,
     const ComputedStyle& style) {
   switch (property) {
     case CSSPropertyBackgroundColor:
       return style.backgroundColor();
     case CSSPropertyBorderLeftColor:
       return style.borderLeftColor();
     case CSSPropertyBorderRightColor:
       return style.borderRightColor();
     case CSSPropertyBorderTopColor:
       return style.borderTopColor();
     case CSSPropertyBorderBottomColor:
       return style.borderBottomColor();
     case CSSPropertyCaretColor:
-      // TODO(rego): "auto" value for caret-color should not interpolate
-      // (http://crbug.com/676295).
       if (style.caretColor().isAutoColor())
-        return StyleColor::currentColor();
+        return nullptr;
       return style.caretColor().toStyleColor();
     case CSSPropertyColor:
       return style.color();
     case CSSPropertyOutlineColor:
       return style.outlineColor();
     case CSSPropertyColumnRuleColor:
       return style.columnRuleColor();
     case CSSPropertyWebkitTextEmphasisColor:
       return style.textEmphasisColor();
     case CSSPropertyWebkitTextFillColor:
       return style.textFillColor();
     case CSSPropertyWebkitTextStrokeColor:
       return style.textStrokeColor();
     case CSSPropertyFloodColor:
       return style.floodColor();
     case CSSPropertyLightingColor:
       return style.lightingColor();
     case CSSPropertyStopColor:
       return style.stopColor();
     case CSSPropertyWebkitTapHighlightColor:
       return style.tapHighlightColor();
     case CSSPropertyTextDecorationColor:
       return style.textDecorationColor();
     default:
       NOTREACHED();
-      return StyleColor::currentColor();
+      return nullptr;
   }
 }
 
-StyleColor ColorPropertyFunctions::getVisitedColor(CSSPropertyID property,
-                                                   const ComputedStyle& style) {
+OptionalStyleColor ColorPropertyFunctions::getVisitedColor(
+    CSSPropertyID property,
+    const ComputedStyle& style) {
   switch (property) {
     case CSSPropertyBackgroundColor:
       return style.visitedLinkBackgroundColor();
     case CSSPropertyBorderLeftColor:
       return style.visitedLinkBorderLeftColor();
     case CSSPropertyBorderRightColor:
       return style.visitedLinkBorderRightColor();
     case CSSPropertyBorderTopColor:
       return style.visitedLinkBorderTopColor();
     case CSSPropertyBorderBottomColor:
@@ skipping 21 matching lines @@
     case CSSPropertyLightingColor:
       return style.lightingColor();
     case CSSPropertyStopColor:
       return style.stopColor();
     case CSSPropertyWebkitTapHighlightColor:
       return style.tapHighlightColor();
     case CSSPropertyTextDecorationColor:
       return style.visitedLinkTextDecorationColor();
     default:
       NOTREACHED();
-      return StyleColor::currentColor();
+      return nullptr;
   }
 }
 
 void ColorPropertyFunctions::setUnvisitedColor(CSSPropertyID property,
                                                ComputedStyle& style,
                                                const Color& color) {
   switch (property) {
     case CSSPropertyBackgroundColor:
       style.setBackgroundColor(color);
       return;
@@ skipping 86 matching lines @@
     case CSSPropertyWebkitTextStrokeColor:
       style.setVisitedLinkTextStrokeColor(color);
       return;
     default:
       NOTREACHED();
       return;
   }
 }
 
 }  // namespace blink