third_party/WebKit/Source/core/layout/LayoutTextCombine.cpp - Issue 2845773002: Make TextDecoration an enum class.

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: third_party/WebKit/Source/core/layout/LayoutTextCombine.cpp

Issue 2845773002: Make TextDecoration an enum class. (Closed)

Patch Set: Rebase Created 3 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:

Index: third_party/WebKit/Source/core/layout/LayoutTextCombine.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutTextCombine.cpp b/third_party/WebKit/Source/core/layout/LayoutTextCombine.cpp

index d62a04f2f6a2c2d021bbc7d59b26027d21e78ea9..1eac78634c62a6130f969175e1c8afa2fd5b281e 100644

--- a/third_party/WebKit/Source/core/layout/LayoutTextCombine.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutTextCombine.cpp

@@ -143,8 +143,8 @@ void LayoutTextCombine::UpdateFont() {

StyleRef(), Style()->Direction());

FontDescription description = OriginalFont().GetFontDescription();

float em_width = description.ComputedSize();

- if (!(Style()->TextDecorationsInEffect() &

- (kTextDecorationUnderline | kTextDecorationOverline)))

+ if (!EnumHasFlags(Style()->TextDecorationsInEffect(),

+ TextDecoration::kUnderline | TextDecoration::kOverline))

em_width *= kTextCombineMargin;

// We are going to draw combined text horizontally.