third_party/WebKit/Source/core/layout/LayoutThemeMac.mm - 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/LayoutThemeMac.mm

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

Index: third_party/WebKit/Source/core/layout/LayoutThemeMac.mm

diff --git a/third_party/WebKit/Source/core/layout/LayoutThemeMac.mm b/third_party/WebKit/Source/core/layout/LayoutThemeMac.mm

index 27649ccb7935fdb072bd7b8be1815f482d5cdcac..ce4beb4570e30cfd780dd71dcb5a90f4c72ea143 100644

--- a/third_party/WebKit/Source/core/layout/LayoutThemeMac.mm

+++ b/third_party/WebKit/Source/core/layout/LayoutThemeMac.mm

@@ -611,7 +611,7 @@ void LayoutThemeMac::setFontFromControlSize(ComputedStyle& style, NSControlSize

style.setLineHeight(ComputedStyle::initialLineHeight());

// TODO(esprehn): The fontSelector manual management is buggy and error prone.

- FontSelector* fontSelector = style.font().fontSelector();

+ FontSelector* fontSelector = style.font().getFontSelector();

if (style.setFontDescription(fontDescription))

style.font().update(fontSelector);

}