diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-11 16:26:55 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-11 16:26:55 +0000 |
| commit | 13f9e0e4b24dd400d7de3a88959822389da59da2 (patch) | |
| tree | a700284f76bd952b7b964607fda3bfe59de57f75 | |
| parent | b3d154de5e4c318f88e4c4ad15fe626054365997 (diff) | |
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
| -rw-r--r-- | src/core/SkFontHost.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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() { |