Chromium Code Reviews

Unified Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 14576017: Implement CSS3TextDecorations runtime flag in favor of CSS3_TEXT (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed a typo in css-properties-as-js-properties-expected-expected.txt Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Index: Source/core/css/CSSComputedStyleDeclaration.cpp
diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp
index c13bfc1b8ef18db4426959a414d9ba7affa7d958..1cbd0a6eeeae96b1de153d10773d277f2d71c59d 100644
--- a/Source/core/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp
@@ -175,18 +175,18 @@ static const CSSPropertyID staticComputableProperties[] = {
CSSPropertyTabSize,
CSSPropertyTextAlign,
CSSPropertyTextDecoration,
+ CSSPropertyTextDecorationLine,
+ CSSPropertyTextDecorationStyle,
+ CSSPropertyTextDecorationColor,
#if ENABLE(CSS3_TEXT)
- CSSPropertyWebkitTextDecorationLine,
- CSSPropertyWebkitTextDecorationStyle,
- CSSPropertyWebkitTextDecorationColor,
CSSPropertyWebkitTextAlignLast,
- CSSPropertyWebkitTextUnderlinePosition,
#endif // CSS3_TEXT
CSSPropertyTextIndent,
CSSPropertyTextRendering,
CSSPropertyTextShadow,
CSSPropertyTextOverflow,
CSSPropertyTextTransform,
+ CSSPropertyTextUnderlinePosition,
CSSPropertyTop,
CSSPropertyTransitionDelay,
CSSPropertyTransitionDuration,
@@ -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)
{
@@ -2133,17 +2131,17 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
case CSSPropertyTextDecoration:
return renderTextDecorationFlagsToCSSValue(style->textDecoration());
#if ENABLE(CSS3_TEXT)
- case CSSPropertyWebkitTextDecorationLine:
+ case CSSPropertyWebkitTextAlignLast:
+ return cssValuePool().createValue(style->textAlignLast());
+#endif // CSS3_TEXT
+ case CSSPropertyTextDecorationLine:
return renderTextDecorationFlagsToCSSValue(style->textDecoration());
- case CSSPropertyWebkitTextDecorationStyle:
+ case CSSPropertyTextDecorationStyle:
return renderTextDecorationStyleFlagsToCSSValue(style->textDecorationStyle());
- case CSSPropertyWebkitTextDecorationColor:
+ case CSSPropertyTextDecorationColor:
return currentColorOrValidColor(style.get(), style->textDecorationColor());
- case CSSPropertyWebkitTextAlignLast:
- return cssValuePool().createValue(style->textAlignLast());
- case CSSPropertyWebkitTextUnderlinePosition:
+ case CSSPropertyTextUnderlinePosition:
return cssValuePool().createValue(style->textUnderlinePosition());
-#endif // CSS3_TEXT
case CSSPropertyWebkitTextDecorationsInEffect:
return renderTextDecorationFlagsToCSSValue(style->textDecorationsInEffect());
case CSSPropertyWebkitTextFillColor:

Powered by Google App Engine