third_party/WebKit/Source/core/layout/LayoutTextControl.cpp - Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide.

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

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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/LayoutTextCombine.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9fb9c4ecdc218e6c474a8eb4aa8b90e0bddc6f2d..470f1531cfcc2feab592867610dfa920934a2456 100644

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

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

@@ -227,13 +227,13 @@ float LayoutTextControl::scaleEmToUnits(int x) const

{

// This matches the unitsPerEm value for MS Shell Dlg and Courier New from the "head" font table.

float unitsPerEm = 2048.0f;

- return roundf(style()->font().fontDescription().computedSize() * x / unitsPerEm);

+ return roundf(style()->font().getFontDescription().computedSize() * x / unitsPerEm);

}

void LayoutTextControl::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const

{

// Use average character width. Matches IE.

- AtomicString family = style()->font().fontDescription().family().family();

+ AtomicString family = style()->font().getFontDescription().family().family();

maxLogicalWidth = preferredContentLogicalWidth(const_cast<LayoutTextControl*>(this)->getAvgCharWidth(family));

if (LayoutBox* innerEditorLayoutBox = innerEditorElement()->layoutBox())

maxLogicalWidth += innerEditorLayoutBox->paddingStart() + innerEditorLayoutBox->paddingEnd();