Index: Source/core/css/DeprecatedStyleBuilder.cpp |
diff --git a/Source/core/css/DeprecatedStyleBuilder.cpp b/Source/core/css/DeprecatedStyleBuilder.cpp |
index 6b37bd2962f110845199f804fab2012ac5eeb0d1..235310799ec0717988823dbf1733dda424a5d915 100644 |
--- a/Source/core/css/DeprecatedStyleBuilder.cpp |
+++ b/Source/core/css/DeprecatedStyleBuilder.cpp |
@@ -1340,7 +1340,6 @@ public: |
} |
}; |
-#if ENABLE(CSS3_TEXT) |
class ApplyPropertyTextUnderlinePosition { |
public: |
static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value) |
@@ -1366,7 +1365,6 @@ public: |
return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), &applyValue); |
} |
}; |
-#endif // CSS3_TEXT |
class ApplyPropertyLineHeight { |
public: |
@@ -2114,17 +2112,18 @@ DeprecatedStyleBuilder::DeprecatedStyleBuilder() |
setPropertyHandler(CSSPropertyTabSize, ApplyPropertyDefault<unsigned, &RenderStyle::tabSize, unsigned, &RenderStyle::setTabSize, unsigned, &RenderStyle::initialTabSize>::createHandler()); |
setPropertyHandler(CSSPropertyTextAlign, ApplyPropertyTextAlign::createHandler()); |
setPropertyHandler(CSSPropertyTextDecoration, ApplyPropertyTextDecoration::createHandler()); |
+ setPropertyHandler(CSSPropertyTextDecorationLine, ApplyPropertyTextDecoration::createHandler()); |
+ setPropertyHandler(CSSPropertyTextDecorationStyle, ApplyPropertyDefault<TextDecorationStyle, &RenderStyle::textDecorationStyle, TextDecorationStyle, &RenderStyle::setTextDecorationStyle, TextDecorationStyle, &RenderStyle::initialTextDecorationStyle>::createHandler()); |
+ setPropertyHandler(CSSPropertyTextDecorationColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textDecorationColor, &RenderStyle::setTextDecorationColor, &RenderStyle::setVisitedLinkTextDecorationColor, &RenderStyle::color>::createHandler()); |
+ |
#if ENABLE(CSS3_TEXT) |
- setPropertyHandler(CSSPropertyWebkitTextDecorationLine, ApplyPropertyTextDecoration::createHandler()); |
- setPropertyHandler(CSSPropertyWebkitTextDecorationStyle, ApplyPropertyDefault<TextDecorationStyle, &RenderStyle::textDecorationStyle, TextDecorationStyle, &RenderStyle::setTextDecorationStyle, TextDecorationStyle, &RenderStyle::initialTextDecorationStyle>::createHandler()); |
- setPropertyHandler(CSSPropertyWebkitTextDecorationColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textDecorationColor, &RenderStyle::setTextDecorationColor, &RenderStyle::setVisitedLinkTextDecorationColor, &RenderStyle::color>::createHandler()); |
setPropertyHandler(CSSPropertyWebkitTextAlignLast, ApplyPropertyDefault<TextAlignLast, &RenderStyle::textAlignLast, TextAlignLast, &RenderStyle::setTextAlignLast, TextAlignLast, &RenderStyle::initialTextAlignLast>::createHandler()); |
- setPropertyHandler(CSSPropertyWebkitTextUnderlinePosition, ApplyPropertyTextUnderlinePosition::createHandler()); |
#endif // CSS3_TEXT |
setPropertyHandler(CSSPropertyTextIndent, ApplyPropertyTextIndent::createHandler()); |
setPropertyHandler(CSSPropertyTextOverflow, ApplyPropertyDefault<TextOverflow, &RenderStyle::textOverflow, TextOverflow, &RenderStyle::setTextOverflow, TextOverflow, &RenderStyle::initialTextOverflow>::createHandler()); |
setPropertyHandler(CSSPropertyTextRendering, ApplyPropertyFont<TextRenderingMode, &FontDescription::textRenderingMode, &FontDescription::setTextRenderingMode, AutoTextRendering>::createHandler()); |
setPropertyHandler(CSSPropertyTextTransform, ApplyPropertyDefault<ETextTransform, &RenderStyle::textTransform, ETextTransform, &RenderStyle::setTextTransform, ETextTransform, &RenderStyle::initialTextTransform>::createHandler()); |
+ setPropertyHandler(CSSPropertyTextUnderlinePosition, ApplyPropertyTextUnderlinePosition::createHandler()); |
setPropertyHandler(CSSPropertyTop, ApplyPropertyLength<&RenderStyle::top, &RenderStyle::setTop, &RenderStyle::initialOffset, AutoEnabled>::createHandler()); |
setPropertyHandler(CSSPropertyUnicodeBidi, ApplyPropertyDefault<EUnicodeBidi, &RenderStyle::unicodeBidi, EUnicodeBidi, &RenderStyle::setUnicodeBidi, EUnicodeBidi, &RenderStyle::initialUnicodeBidi>::createHandler()); |
setPropertyHandler(CSSPropertyVerticalAlign, ApplyPropertyVerticalAlign::createHandler()); |