Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm - Issue 10072004: Merge 113132 - [Chromium] Out-of-process font loading garbles text

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/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

« no previous file with comments | « Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm ('k') | Source/WebCore/platform/graphics/mac/FontCacheMac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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;