Source/core/css/CSSProperty.cpp - Issue 16337002: Revert "Revert "Implement CSS3TextDecorations runtime flag in favor 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/CSSProperty.cpp

Issue 16337002: Revert "Revert "Implement CSS3TextDecorations runtime flag in favor of CSS3_TEXT"" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 7 years, 6 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

Index: Source/core/css/CSSProperty.cpp

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

index 20baa5453c5acdae472a83fb47ec04e7f1c3d3d9..6f49fca769d727519be502e7c184c00579ae8c27 100644

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

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

@@ -303,6 +303,7 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)

case CSSPropertyTextAlign:

case CSSPropertyTextAnchor:

case CSSPropertyTextDecoration:

+ case CSSPropertyTextDecorationLine:

case CSSPropertyTextIndent:

case CSSPropertyTextRendering:

case CSSPropertyTextShadow:

@@ -339,7 +340,6 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)

case CSSPropertyWebkitTapHighlightColor:

case CSSPropertyWebkitTextCombine:

#if ENABLE(CSS3_TEXT)

- case CSSPropertyWebkitTextDecorationLine:

case CSSPropertyWebkitTextAlignLast:

case CSSPropertyWebkitTextUnderlinePosition:

#endif // CSS3_TEXT

@@ -471,6 +471,8 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)

case CSSPropertyStopColor:

case CSSPropertyStopOpacity:

case CSSPropertyTableLayout:

+ case CSSPropertyTextDecorationStyle:

+ case CSSPropertyTextDecorationColor:

case CSSPropertyTextLineThroughColor:

case CSSPropertyTextLineThroughMode:

case CSSPropertyTextLineThroughStyle:

@@ -628,10 +630,6 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)

case CSSPropertyWebkitPerspectiveOrigin:

case CSSPropertyWebkitPerspectiveOriginX:

case CSSPropertyWebkitPerspectiveOriginY:

-#if ENABLE(CSS3_TEXT)

- case CSSPropertyWebkitTextDecorationStyle:

- case CSSPropertyWebkitTextDecorationColor:

-#endif // CSS3_TEXT

case CSSPropertyWebkitTransform:

case CSSPropertyWebkitTransformOrigin:

case CSSPropertyWebkitTransformOriginX:

« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/CSSPropertyNames.in » ('j') | no next file with comments »