third_party/WebKit/Source/core/layout/LayoutInline.cpp - Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/

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/LayoutInline.cpp

Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-8

Patch Set: get-names-9: rebase Created 4 years, 10 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 | « third_party/WebKit/Source/core/layout/LayoutImage.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 2b830b070a27d7c5b949c5e36aaf1bcc82416526..b067ecad0efff31bb8e6ac176ca999fc365f2709 100644

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

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

@@ -211,7 +211,7 @@ void LayoutInline::updateAlwaysCreateLineBoxes(bool fullLayout)

bool alwaysCreateLineBoxesNew = (parentLayoutInline && parentLayoutInline->alwaysCreateLineBoxes())

|| (parentLayoutInline && parentStyle.verticalAlign() != BASELINE)

|| style()->verticalAlign() != BASELINE

- || style()->textEmphasisMark() != TextEmphasisMarkNone

+ || style()->getTextEmphasisMark() != TextEmphasisMarkNone

|| (checkFonts && (!parentStyle.font().fontMetrics().hasIdenticalAscentDescentAndLineGap(style()->font().fontMetrics())

|| parentStyle.lineHeight() != style()->lineHeight()));