| 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 81e3219d2927c9fd8663c8b96a62b9edaa117c60..861e733f576aa4669c2164a1bed38d51c911705c 100644
|
| --- a/Source/core/scripts/templates/StyleBuilderFunctions.cpp.tmpl
|
| +++ b/Source/core/scripts/templates/StyleBuilderFunctions.cpp.tmpl
|
| @@ -15,18 +15,20 @@
|
| #include "core/css/BasicShapeFunctions.h"
|
| #include "core/css/CSSPrimitiveValueMappings.h"
|
| #include "core/css/Pair.h"
|
| -#include "core/css/resolver/StyleResolver.h"
|
| +#include "core/css/resolver/StyleResolverState.h"
|
| +#include "core/platform/animation/CSSAnimationDataList.h"
|
| +
|
|
|
| {%- macro declare_initial_function(property_id) -%}
|
| -void StyleBuilderFunctions::applyInitial{{property_id}}(StyleResolver* styleResolver, StyleResolverState& state)
|
| +void StyleBuilderFunctions::applyInitial{{property_id}}(StyleResolverState& state)
|
| {%- endmacro %}
|
|
|
| {%- macro declare_inherit_function(property_id) -%}
|
| -void StyleBuilderFunctions::applyInherit{{property_id}}(StyleResolver* styleResolver, StyleResolverState& state)
|
| +void StyleBuilderFunctions::applyInherit{{property_id}}(StyleResolverState& state)
|
| {%- endmacro %}
|
|
|
| {%- macro declare_value_function(property_id) -%}
|
| -void StyleBuilderFunctions::applyValue{{property_id}}(StyleResolver* styleResolver, StyleResolverState& state, CSSValue* value)
|
| +void StyleBuilderFunctions::applyValue{{property_id}}(StyleResolverState& state, CSSValue* value)
|
| {%- endmacro %}
|
|
|
| // FIXME: This is duplicated in StyleBuilder.cpp.tmpl, but we'll move the
|
| @@ -307,7 +309,7 @@ namespace WebCore {
|
|
|
| {%- if inherit_color %}
|
| if (primitiveValue->getValueID() == CSSValueCurrentcolor) {
|
| - applyInherit{{property_id}}(styleResolver, state);
|
| + applyInherit{{property_id}}(state);
|
| return;
|
| }
|
| {%- endif %}
|
|
|