Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(858)

Unified Diff: Source/core/rendering/RenderThemeChromiumMac.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/core/rendering/RenderThemeChromiumMac.mm
diff --git a/Source/core/rendering/RenderThemeChromiumMac.mm b/Source/core/rendering/RenderThemeChromiumMac.mm
index 22f7d186d94988c944d994e8c1faec7a424128ed..aef7a5d053bf52496ef0c5ec8a4884d7637809e2 100644
--- a/Source/core/rendering/RenderThemeChromiumMac.mm
+++ b/Source/core/rendering/RenderThemeChromiumMac.mm
@@ -303,7 +303,8 @@ void RenderThemeChromiumMac::systemFont(CSSValueID cssValueId, FontDescription&
NSFontManager *fontManager = [NSFontManager sharedFontManager];
cachedDesc->setIsAbsoluteSize(true);
cachedDesc->setGenericFamily(FontDescription::NoFamily);
- cachedDesc->firstFamily().setFamily([font webCoreFamilyName]);
+ NSString* nsFamilyName = [font webCoreFamilyName];
dglazkov 2014/01/15 18:47:08 Should this be part of AtomicString constructor?
+ cachedDesc->firstFamily().setFamily(AtomicString([nsFamilyName UTF8String]));
cachedDesc->setSpecifiedSize([font pointSize]);
cachedDesc->setWeight(toFontWeight([fontManager weightOfFont:font]));
cachedDesc->setItalic([fontManager traitsOfFont:font] & NSItalicFontMask);
@@ -725,7 +726,8 @@ void RenderThemeChromiumMac::setFontFromControlSize(RenderStyle* style, NSContro
fontDescription.setGenericFamily(FontDescription::SerifFamily);
NSFont* font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:controlSize]];
- fontDescription.firstFamily().setFamily([font webCoreFamilyName]);
+ NSString* nsFamilyName = [font webCoreFamilyName];
+ fontDescription.firstFamily().setFamily(AtomicString([nsFamilyName UTF8String]));
fontDescription.setComputedSize([font pointSize] * style->effectiveZoom());
fontDescription.setSpecifiedSize([font pointSize] * style->effectiveZoom());
« no previous file with comments | « no previous file | Source/platform/fonts/mac/ComplexTextControllerCoreText.mm » ('j') | Source/platform/fonts/mac/FontCacheMac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698