| Index: Source/core/scripts/templates/StyleBuilderFunctions.cpp.tmpl
|
| diff --git a/Source/core/scripts/templates/StyleBuilderFunctions.cpp.tmpl b/Source/core/scripts/templates/StyleBuilderFunctions.cpp.tmpl
|
| index f803622695aa2a26b9fc91a12994f512bfea039a..103f4365991493709d757450ae8d64386b09c4ce 100644
|
| --- a/Source/core/scripts/templates/StyleBuilderFunctions.cpp.tmpl
|
| +++ b/Source/core/scripts/templates/StyleBuilderFunctions.cpp.tmpl
|
| @@ -273,7 +273,7 @@ namespace WebCore {
|
| {%- set visited_link_setter = "setVisitedLink" + property.camel_case_name %}
|
| {{ declare_initial_function(property_id) }}
|
| {
|
| - Color color = {{ initial_color or "Color" -}}();
|
| + StyleColor color = {{ initial_color or "StyleColor" -}}();
|
| if (state.applyPropertyToRegularStyle())
|
| {{ set_value(property) }}(color);
|
| if (state.applyPropertyToVisitedLinkStyle())
|
| @@ -283,7 +283,7 @@ namespace WebCore {
|
| {{ declare_inherit_function(property_id) }}
|
| {
|
| // Visited link style can never explicitly inherit from parent visited link style so no separate getters are needed.
|
| - Color color = state.parentStyle()->{{property.getter}}();
|
| + StyleColor color = state.parentStyle()->{{property.getter}}();
|
| if (!color.isValid())
|
| color = state.parentStyle()->{{default_getter}}();
|
| if (state.applyPropertyToRegularStyle())
|
| @@ -307,9 +307,9 @@ namespace WebCore {
|
| {%- endif %}
|
|
|
| if (state.applyPropertyToRegularStyle())
|
| - {{ set_value(property) }}(state.document()->textLinkColors().colorFromPrimitiveValue(primitiveValue, state.style()->visitedDependentColor(CSSPropertyColor)));
|
| + {{ set_value(property) }}(state.document()->textLinkColors().colorFromPrimitiveValue(primitiveValue));
|
| if (state.applyPropertyToVisitedLinkStyle())
|
| - state.style()->{{visited_link_setter}}(state.document()->textLinkColors().colorFromPrimitiveValue(primitiveValue, state.style()->visitedDependentColor(CSSPropertyColor), state.element()->isLink() /* forVisitedLink */));
|
| + state.style()->{{visited_link_setter}}(state.document()->textLinkColors().colorFromPrimitiveValue(primitiveValue, state.element()->isLink() /* forVisitedLink */));
|
| }
|
| {%- endmacro %}
|
|
|
|
|