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

Unified Diff: Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm

Issue 10072004: Merge 113132 - [Chromium] Out-of-process font loading garbles text (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 8 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/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
===================================================================
--- Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (revision 114070)
+++ Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (working copy)
@@ -247,6 +247,13 @@
if (m_CTFont)
return m_CTFont.get();
+#if PLATFORM(CHROMIUM)
+ if (m_inMemoryFont) {
+ m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_inMemoryFont->cgFont(), m_size, 0, canSetCascadeListForCustomFont() ? cascadeToLastResortFontDescriptor() : 0));
+ return m_CTFont.get();
+ }
+#endif
+
m_CTFont = toCTFontRef(m_font);
if (m_CTFont) {
CTFontDescriptorRef fontDescriptor;

Powered by Google App Engine
This is Rietveld 408576698