Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor"

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 84 matching lines @@
 {
     return AnimatableLengthBox::create(
         createFromLength(lengthBox.left(), style),
         createFromLength(lengthBox.right(), style),
         createFromLength(lengthBox.top(), style),
         createFromLength(lengthBox.bottom(), style));
 }
 
 PassRefPtr<AnimatableValue> CSSAnimatableValueFactory::createFromColor(CSSPropertyID property, const RenderStyle* style)
 {
-    StyleColor color = style->colorIncludingFallback(property, false);
-    StyleColor visitedLinkColor = style->colorIncludingFallback(property, true);
-    Color fallbackColor = style->color().color();
-    Color fallbackVisitedLinkColor = style->visitedLinkColor().color();
+    Color color = style->colorIncludingFallback(property, false);
+    Color visitedLinkColor = style->colorIncludingFallback(property, true);
+    Color fallbackColor = style->color();
+    Color fallbackVisitedLinkColor = style->visitedLinkColor();
     Color resolvedColor;
-    if (color.isValid() && !color.isCurrentColor())
-        resolvedColor = color.color();
+    if (color.isValid())
+        resolvedColor = color;
     else
         resolvedColor = fallbackColor;
     Color resolvedVisitedLinkColor;
-    if (visitedLinkColor.isValid() && !visitedLinkColor.isCurrentColor())
-        resolvedVisitedLinkColor = visitedLinkColor.color();
+    if (visitedLinkColor.isValid())
+        resolvedVisitedLinkColor = visitedLinkColor;
     else
         resolvedVisitedLinkColor = fallbackVisitedLinkColor;
     return AnimatableColor::create(resolvedColor, resolvedVisitedLinkColor);
 }
 
 // FIXME: Generate this function.
 PassRefPtr<AnimatableValue> CSSAnimatableValueFactory::create(CSSPropertyID property, const RenderStyle* style)
 {
     switch (property) {
     case CSSPropertyBackgroundColor:
@@ skipping 93 matching lines @@
     case CSSPropertyWidth:
         return createFromLength(style->width(), style);
     default:
         RELEASE_ASSERT_WITH_MESSAGE(!CSSAnimations::isAnimatableProperty(property), "Web Animations not yet implemented: Create AnimatableValue from render style: %s", getPropertyNameString(property).utf8().data());
         ASSERT_NOT_REACHED();
         return 0;
     }
 }
 
 } // namespace WebCore