From 13f9e0e4b24dd400d7de3a88959822389da59da2 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Mon, 11 Nov 2013 16:26:55 +0000 Subject: Re-add NULL FontMgr::Factory hadnling code removed in r12217. git-svn-id: http://skia.googlecode.com/svn/trunk@12218 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkFontHost.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/SkFontHost.cpp b/src/core/SkFontHost.cpp index ab32dfc6b2..c09739d02f 100644 --- a/src/core/SkFontHost.cpp +++ b/src/core/SkFontHost.cpp @@ -193,6 +193,10 @@ SkTypeface* SkFontMgr::legacyCreateTypeface(const char familyName[], void set_up_default(SkFontMgr** singleton) { *singleton = SkFontMgr::Factory(); + // we never want to return NULL + if (NULL == *singleton) { + *singleton = SkNEW(SkEmptyFontMgr); + } } SkFontMgr* SkFontMgr::RefDefault() { -- cgit v1.2.3