commit 197095302c0656b1d1b2caeac3928a66c097a003
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 11 16:26:55 2013 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 11 16:26:55 2013 +0000
tree 70a2193991647a8e932c0b89986041b46bde314b
parent c6d9e607a7620d35bd68d7b2d505f038e75b6577

Re-add NULL FontMgr::Factory hadnling code removed in r12217.


git-svn-id: http://skia.googlecode.com/svn/trunk/src@12218 2bbb7eff-a529-9590-31e7-b0007b416f81

core/SkFontHost.cpp

diff --git a/core/SkFontHost.cpp b/core/SkFontHost.cpp
index ab32dfc..c09739d 100644
--- a/core/SkFontHost.cpp
+++ b/core/SkFontHost.cpp
@@ -193,6 +193,10 @@
 
 void set_up_default(SkFontMgr** singleton) {
   *singleton = SkFontMgr::Factory();
+  // we never want to return NULL
+  if (NULL == *singleton) {
+      *singleton = SkNEW(SkEmptyFontMgr);
+  }
 }
 
 SkFontMgr* SkFontMgr::RefDefault() {