AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert of https://codereview.chromium.org/109033002/

Browse Source 
Reason for revert: I suspect this is causing GM to crash on Mac.

R=bungeman@google.com, reed@google.com
TBR=bungeman@google.com, reed@google.com
NOTREECHECKS=true
NOTRY=true

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/111853003

git-svn-id: http://skia.googlecode.com/svn/trunk@12603 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2013-12-10 17:08:55 +00:00
parent 15bc13d20f
commit 7ad9368687
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ports/SkFontHost_mac.cpp
View File

@ -2103,13 +2103,7 @@ static SkTypeface* createFromDesc(CFStringRef cfFamilyName,
return face;
}
AutoCFRelease<CFDictionaryRef> fontFamilyNameDictionary(
CFDictionaryCreate(kCFAllocatorDefault,
(const void**)&kCTFontFamilyNameAttribute, (const void**)&cfFamilyName,
1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
AutoCFRelease<CTFontDescriptorRef> fontDescriptor(
CTFontDescriptorCreateWithAttributes(fontFamilyNameDictionary));
AutoCFRelease<CTFontRef> ctNamed(CTFontCreateWithFontDescriptor(fontDescriptor, 0, NULL));
AutoCFRelease<CTFontRef> ctNamed(CTFontCreateWithName(cfFamilyName, 1, NULL));
CTFontRef ctFont = CTFontCreateCopyWithAttributes(ctNamed, 1, NULL, desc);
if (NULL == ctFont) {
return NULL;