Source/core/css/CSSProperty.cpp - Issue 14576017: 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 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

Index: Source/core/css/CSSProperty.cpp

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

index 93282bd7397b10a846a6afa39a1ac7016fc6a91e..47f968bdffcfcaaf8d3c8f3b2c2c8221529a6ec7 100644

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

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

@@ -315,11 +315,11 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)

case CSSPropertyWebkitRubyPosition:

case CSSPropertyWebkitTextCombine:

#if ENABLE(CSS3_TEXT)

- case CSSPropertyWebkitTextDecorationLine:

case CSSPropertyWebkitTextAlignLast:

- case CSSPropertyWebkitTextUnderlinePosition:

#endif // CSS3_TEXT

case CSSPropertyWebkitTextDecorationsInEffect:

+ case CSSPropertyWebkitTextDecorationLine:

+ case CSSPropertyWebkitTextUnderlinePosition:

case CSSPropertyWebkitTextEmphasis:

case CSSPropertyWebkitTextEmphasisColor:

case CSSPropertyWebkitTextEmphasisPosition:

@@ -619,10 +619,8 @@ 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/CSSPrimitiveValueMappings.h ('k') | Source/core/css/CSSPropertyNames.in » ('j') | Source/core/rendering/RootInlineBox.h » ('J')