Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1033)

Unified Diff: Source/core/scripts/templates/StyleBuilderFunctions.cpp.tmpl

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 c7677e15c5432c89e769e18558594a8f180bbb9f..e56673acd9bc2d80e44bf98c98f53204d5295d3b 100644
--- a/Source/core/scripts/templates/StyleBuilderFunctions.cpp.tmpl
+++ b/Source/core/scripts/templates/StyleBuilderFunctions.cpp.tmpl
@@ -248,7 +248,7 @@ namespace WebCore {
{%- 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())
@@ -258,7 +258,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.
- StyleColor color = state.parentStyle()->{{property.getter}}();
+ Color color = state.parentStyle()->{{property.getter}}();
if (!color.isValid())
color = state.parentStyle()->{{default_getter}}();
if (state.applyPropertyToRegularStyle())
@@ -282,9 +282,9 @@ namespace WebCore {
{%- 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 %}

Powered by Google App Engine
This is Rietveld 408576698