diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-11 17:49:42 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-11 17:49:42 +0000 |
| commit | e0f04689c8ae098a5244a17bc9b364fb5003f797 (patch) | |
| tree | e46ecd688bdbd4b862033a3d0079f113f363ee2f | |
| parent | f376f5de934b754f164100621acea5e54590e676 (diff) | |
Give Android a SkFontMgr::Factory which was missing as of r12217.
git-svn-id: http://skia.googlecode.com/svn/trunk@12220 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/ports/SkFontConfigInterface_android.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ports/SkFontConfigInterface_android.cpp b/src/ports/SkFontConfigInterface_android.cpp index 6f9ed3a93b..6c3e8d5625 100644 --- a/src/ports/SkFontConfigInterface_android.cpp +++ b/src/ports/SkFontConfigInterface_android.cpp @@ -930,5 +930,6 @@ SkTypeface* SkCreateTypefaceForScript(HB_Script script, SkTypeface::Style style, /////////////////////////////////////////////////////////////////////////////// SkFontMgr* SkFontMgr::Factory() { - return NULL; + SkFontConfigInterface* fci = SkFontConfigInterface::GetSingletonDirectInterface(); + return fci ? SkNEW_ARGS(SkFontMgr_fontconfig, (fci)) : NULL; } |