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

Source/core/scripts/templates/StyleBuilderFunctions.cpp.tmpl

 {% from "macros.tmpl" import lower_first -%}
 
 {#
     This file is for property handlers which use the templating engine to
     reduce (handwritten) code duplication.
 
     The `properties' dict can be used to access a property's parameters in
     jinja2 templates (i.e. setter, getter, initial, type_name)
 -#}
 
@@ skipping 230 matching lines @@
 {%- endmacro %}
 
 {{ apply_value_border_image_source("CSSPropertyBorderImageSource") }}
 {{ apply_value_border_image_source("CSSPropertyWebkitMaskBoxImageSource") }}
 
 {%- macro apply_color(property_id, default_getter="color", initial_color=none, inherit_color=false) %}
 {%- set property = properties[property_id] %}
 {%- set visited_link_setter = "setVisitedLink" + property.camel_case_name %}
 {{ declare_initial_function(property_id) }}
 {
-    StyleColor color = {{ initial_color or "StyleColor" -}}();
+    Color color = {{ initial_color or "Color" -}}();
     if (state.applyPropertyToRegularStyle())
         {{ set_value(property) }}(color);
     if (state.applyPropertyToVisitedLinkStyle())
         state.style()->{{visited_link_setter}}(color);
 }
 
 {{ declare_inherit_function(property_id) }}
 {
     // Visited link style can never explicitly inherit from parent visited link style so no separate getters are needed.
-    StyleColor color = state.parentStyle()->{{property.getter}}();
+    Color color = state.parentStyle()->{{property.getter}}();
     if (!color.isValid())
         color = state.parentStyle()->{{default_getter}}();
     if (state.applyPropertyToRegularStyle())
         {{ set_value(property) }}(color);
     if (state.applyPropertyToVisitedLinkStyle())
         state.style()->{{visited_link_setter}}(color);
 }
 
 {{ declare_value_function(property_id) }}
 {
     if (!value->isPrimitiveValue())
         return;
 
     CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
 
 {%- if inherit_color %}
     if (primitiveValue->getValueID() == CSSValueCurrentcolor) {
         applyInherit{{property_id}}(state);
         return;
     }
 {%- endif %}
 
     if (state.applyPropertyToRegularStyle())
-        {{ set_value(property) }}(state.document().textLinkColors().colorFromPrimitiveValue(primitiveValue));
+        {{ set_value(property) }}(state.document().textLinkColors().colorFromPrimitiveValue(primitiveValue, state.style()->visitedDependentColor(CSSPropertyColor)));
     if (state.applyPropertyToVisitedLinkStyle())
-        state.style()->{{visited_link_setter}}(state.document().textLinkColors().colorFromPrimitiveValue(primitiveValue, state.element()->isLink() /* forVisitedLink */));
+        state.style()->{{visited_link_setter}}(state.document().textLinkColors().colorFromPrimitiveValue(primitiveValue, state.style()->visitedDependentColor(CSSPropertyColor), state.element()->isLink() /* forVisitedLink */));
 }
 {%- endmacro %}
 
 {{ apply_color("CSSPropertyBackgroundColor", default_getter="invalidColor") }}
 {{ apply_color("CSSPropertyBorderBottomColor") }}
 {{ apply_color("CSSPropertyBorderLeftColor") }}
 {{ apply_color("CSSPropertyBorderRightColor") }}
 {{ apply_color("CSSPropertyBorderTopColor") }}
 {{ apply_color("CSSPropertyColor", inherit_color=true, default_getter="invalidColor", initial_color="RenderStyle::initialColor") }}
 {{ apply_color("CSSPropertyOutlineColor") }}
@@ skipping 209 matching lines @@
     } else if (value->isImageValue()) {
         {{ set_value(property) }}(ShapeValue::createImageValue(state.styleImage({{property_id}}, value)));
     }
 }
 {%- endmacro %}
 
 {{ apply_value_shape("CSSPropertyWebkitShapeInside") }}
 {{ apply_value_shape("CSSPropertyWebkitShapeOutside") }}
 
 } // namespace WebCore