third_party/WebKit/Source/core/layout/LayoutTextControlSingleLine.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/LayoutTextControlSingleLine.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/LayoutTextControl.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTheme.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index df2aee284ba6d6eb3324fbaea5393ae000a4b7e4..820c0a70ea0a8799d252b7b87cf0b379e01b4d79 100644

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

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

@@ -231,7 +231,7 @@ LayoutUnit LayoutTextControlSingleLine::preferredContentLogicalWidth(float charW

LayoutUnit result = LayoutUnit::fromFloatCeil(charWidth * factor);

float maxCharWidth = 0.f;

- AtomicString family = styleRef().font().fontDescription().family().family();

+ AtomicString family = styleRef().font().getFontDescription().family().family();

// Match the default system font to the width of MS Shell Dlg, the default

// font for textareas in Firefox, Safari Win and IE for some encodings (in

// IE, the default font is encoding specific). 4027 is the (xMax - xMin)