| Index: Source/core/css/resolver/StyleBuilderCustom.cpp
|
| diff --git a/Source/core/css/resolver/StyleBuilderCustom.cpp b/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| index 8b4e12bf929a300863778ebf67718821c1c5b37f..1f1c9d3fc9ca5036bf671ab23045f810b49479dc 100644
|
| --- a/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| +++ b/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| @@ -798,8 +798,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyWebkitTextEmphasisStyle(StyleRe
|
| }
|
| }
|
|
|
| -#if ENABLE(CSS3_TEXT)
|
| -void StyleBuilderFunctions::applyValueCSSPropertyWebkitTextUnderlinePosition(StyleResolverState& state, CSSValue* value)
|
| +void StyleBuilderFunctions::applyValueCSSPropertyTextUnderlinePosition(StyleResolverState& state, CSSValue* value)
|
| {
|
| // This is true if value is 'auto' or 'alphabetic'.
|
| if (value->isPrimitiveValue()) {
|
| @@ -816,7 +815,6 @@ void StyleBuilderFunctions::applyValueCSSPropertyWebkitTextUnderlinePosition(Sty
|
| }
|
| state.style()->setTextUnderlinePosition(static_cast<TextUnderlinePosition>(t));
|
| }
|
| -#endif // CSS3_TEXT
|
|
|
| Length StyleBuilderConverter::convertLength(StyleResolverState& state, CSSValue* value)
|
| {
|
| @@ -2093,9 +2091,7 @@ void StyleBuilder::oldApplyProperty(CSSPropertyID id, StyleResolverState& state,
|
| case CSSPropertyWebkitRtlOrdering:
|
| case CSSPropertyWebkitRubyPosition:
|
| case CSSPropertyWebkitTextCombine:
|
| -#if ENABLE(CSS3_TEXT)
|
| - case CSSPropertyWebkitTextUnderlinePosition:
|
| -#endif // CSS3_TEXT
|
| + case CSSPropertyTextUnderlinePosition:
|
| case CSSPropertyWebkitTextEmphasisColor:
|
| case CSSPropertyWebkitTextEmphasisPosition:
|
| case CSSPropertyWebkitTextEmphasisStyle:
|
|
|