Source/core/css/CSSComputedStyleDeclaration.cpp - Issue 14576017: Implement CSS3TextDecorations runtime flag in favor of CSS3_TEXT

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: Updated css-properties-as-js-properties.html layout test expectations to match new properties. Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « LayoutTests/webexposed/css-properties-as-js-properties-expected.txt ('k') | Source/core/css/CSSParser.h » ('j') | Source/core/rendering/RootInlineBox.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/css/CSSComputedStyleDeclaration.cpp

diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp

index 0841bb95d5e2981c4bf37b473a37e5d235d260b4..418806e03a2c869f5af7d15efbd1201b22257e86 100644

--- a/Source/core/css/CSSComputedStyleDeclaration.cpp

+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp

@@ -176,12 +176,12 @@ static const CSSPropertyID staticComputableProperties[] = {

CSSPropertyTextAlign,

CSSPropertyTextDecoration,

#if ENABLE(CSS3_TEXT)

+ CSSPropertyWebkitTextAlignLast,

+#endif // CSS3_TEXT

CSSPropertyWebkitTextDecorationLine,

CSSPropertyWebkitTextDecorationStyle,

CSSPropertyWebkitTextDecorationColor,

- CSSPropertyWebkitTextAlignLast,

CSSPropertyWebkitTextUnderlinePosition,

-#endif // CSS3_TEXT

CSSPropertyTextIndent,

CSSPropertyTextRendering,

CSSPropertyTextShadow,

@@ -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 CSSPropertyWebkitTextAlignLast:

+ return cssValuePool().createValue(style->textAlignLast());

+#endif // CSS3_TEXT

case CSSPropertyWebkitTextDecorationLine:

return renderTextDecorationFlagsToCSSValue(style->textDecoration());

case CSSPropertyWebkitTextDecorationStyle:

return renderTextDecorationStyleFlagsToCSSValue(style->textDecorationStyle());

case CSSPropertyWebkitTextDecorationColor:

return currentColorOrValidColor(style.get(), style->textDecorationColor());

- case CSSPropertyWebkitTextAlignLast:

- return cssValuePool().createValue(style->textAlignLast());

case CSSPropertyWebkitTextUnderlinePosition:

return cssValuePool().createValue(style->textUnderlinePosition());

-#endif // CSS3_TEXT

case CSSPropertyWebkitTextDecorationsInEffect:

return renderTextDecorationFlagsToCSSValue(style->textDecorationsInEffect());

case CSSPropertyWebkitTextFillColor: