Source/core/css/CSSComputedStyleDeclaration.cpp - Issue 19041005: Introduce css3TextEnabled instead of CSS3_TEXT.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 19041005: Introduce css3TextEnabled instead of CSS3_TEXT. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Patch for landing Created 7 years, 5 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:

Index: Source/core/css/CSSComputedStyleDeclaration.cpp

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

index f73d3a132aafda27867691843f109d937779e0c2..a45d4c1524d0d8ad050cecefc4596146dca9ae95 100644

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

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

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

CSSPropertyTableLayout,

CSSPropertyTabSize,

CSSPropertyTextAlign,

+ CSSPropertyTextAlignLast,

CSSPropertyTextDecoration,

CSSPropertyTextDecorationLine,

CSSPropertyTextDecorationStyle,

CSSPropertyTextDecorationColor,

#if ENABLE(CSS3_TEXT)

- CSSPropertyWebkitTextAlignLast,

CSSPropertyWebkitTextUnderlinePosition,

#endif // CSS3_TEXT

CSSPropertyTextIndent,

@@ -2160,6 +2160,8 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert

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

case CSSPropertyTextAlign:

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

+ case CSSPropertyTextAlignLast:

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

case CSSPropertyTextDecoration:

case CSSPropertyTextDecorationLine:

return renderTextDecorationFlagsToCSSValue(style->textDecoration());

@@ -2168,8 +2170,6 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert

case CSSPropertyTextDecorationColor:

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

#if ENABLE(CSS3_TEXT)

- case CSSPropertyWebkitTextAlignLast:

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

case CSSPropertyWebkitTextUnderlinePosition:

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

#endif // CSS3_TEXT