Source/platform/mac/ThemeMac.mm - Issue 139243002: StringImpl should not be referred from StringImplCF.

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: Source/platform/mac/ThemeMac.mm

Issue 139243002: StringImpl should not be referred from StringImplCF. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 11 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

Index: Source/platform/mac/ThemeMac.mm

diff --git a/Source/platform/mac/ThemeMac.mm b/Source/platform/mac/ThemeMac.mm

index 8bc1a6068761495de414c0996d6e322e2223e6b4..3d9b7ead3f6570d47192a579f80b6ae1c47c33a1 100644

--- a/Source/platform/mac/ThemeMac.mm

+++ b/Source/platform/mac/ThemeMac.mm

@@ -575,7 +575,8 @@ FontDescription ThemeMac::controlFont(ControlPart part, const FontDescription& f

result.setGenericFamily(FontDescription::SerifFamily);

NSFont* nsFont = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:controlSizeForFont(fontDescription)]];

- result.firstFamily().setFamily([nsFont webCoreFamilyName]);

+ NSString* nsFamilyName = [nsFont webCoreFamilyName];

+ result.firstFamily().setFamily(AtomicString([nsFamilyName UTF8String]));

result.setComputedSize([nsFont pointSize] * zoomFactor);

result.setSpecifiedSize([nsFont pointSize] * zoomFactor);

return result;

« Source/platform/fonts/mac/FontCacheMac.mm ('K') | « Source/platform/fonts/mac/FontCacheMac.mm ('k') | Source/platform/text/LocaleMac.mm » ('j') | Source/platform/text/LocaleMac.mm » ('J')