Index: Source/core/css/CSSComputedStyleDeclaration.cpp |
diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp |
index c13bfc1b8ef18db4426959a414d9ba7affa7d958..56293e807c9febee5de4690c12d9dd3e90ede14f 100644 |
--- a/Source/core/css/CSSComputedStyleDeclaration.cpp |
+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp |
@@ -175,10 +175,10 @@ static const CSSPropertyID staticComputableProperties[] = { |
CSSPropertyTabSize, |
CSSPropertyTextAlign, |
CSSPropertyTextDecoration, |
+ CSSPropertyTextDecorationLine, |
+ CSSPropertyTextDecorationStyle, |
+ CSSPropertyTextDecorationColor, |
#if ENABLE(CSS3_TEXT) |
- CSSPropertyWebkitTextDecorationLine, |
- CSSPropertyWebkitTextDecorationStyle, |
- CSSPropertyWebkitTextDecorationColor, |
CSSPropertyWebkitTextAlignLast, |
CSSPropertyWebkitTextUnderlinePosition, |
#endif // CSS3_TEXT |
@@ -1322,7 +1322,6 @@ static PassRefPtr<CSSValue> renderTextDecorationFlagsToCSSValue(int textDecorati |
return list; |
} |
-#if ENABLE(CSS3_TEXT) |
static PassRefPtr<CSSValue> renderTextDecorationStyleFlagsToCSSValue(TextDecorationStyle textDecorationStyle) |
{ |
switch (textDecorationStyle) { |
@@ -1341,7 +1340,6 @@ static PassRefPtr<CSSValue> renderTextDecorationStyleFlagsToCSSValue(TextDecorat |
ASSERT_NOT_REACHED(); |
return cssValuePool().createExplicitInitialValue(); |
} |
-#endif // CSS3_TEXT |
static PassRefPtr<CSSValue> fillRepeatToCSSValue(EFillRepeat xRepeat, EFillRepeat yRepeat) |
{ |
@@ -2131,14 +2129,13 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert |
case CSSPropertyTextAlign: |
return cssValuePool().createValue(style->textAlign()); |
case CSSPropertyTextDecoration: |
+ case CSSPropertyTextDecorationLine: |
return renderTextDecorationFlagsToCSSValue(style->textDecoration()); |
-#if ENABLE(CSS3_TEXT) |
- case CSSPropertyWebkitTextDecorationLine: |
- return renderTextDecorationFlagsToCSSValue(style->textDecoration()); |
- case CSSPropertyWebkitTextDecorationStyle: |
+ case CSSPropertyTextDecorationStyle: |
return renderTextDecorationStyleFlagsToCSSValue(style->textDecorationStyle()); |
- case CSSPropertyWebkitTextDecorationColor: |
+ case CSSPropertyTextDecorationColor: |
return currentColorOrValidColor(style.get(), style->textDecorationColor()); |
+#if ENABLE(CSS3_TEXT) |
case CSSPropertyWebkitTextAlignLast: |
return cssValuePool().createValue(style->textAlignLast()); |
case CSSPropertyWebkitTextUnderlinePosition: |