commit ad6477d02a61e8955e9fc1352c91fad7e2fc3c70
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 07 03:17:12 2013 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 07 03:17:12 2013 +0000
tree ad755a4891fc6e7c55dcc88ff6141e7defb5255b
parent a980269c2498836101146adc729ef780fb89824e

Work around broken SkFontMgr_fontconfig.cpp for test.


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

tests/FontNamesTest.cpp

diff --git a/tests/FontNamesTest.cpp b/tests/FontNamesTest.cpp
index 18ba356..ee0a116 100644
--- a/tests/FontNamesTest.cpp
+++ b/tests/FontNamesTest.cpp
@@ -153,6 +153,10 @@
             set->getStyle(j, &fs, &sname);
 
             SkAutoTUnref<SkTypeface> typeface(set->createTypeface(j));
+            if (NULL == typeface.get()) {
+                //TODO: SkFontMgr_fontconfig always returns NULL?
+                continue;
+            }
 
             SkString familyName;
             typeface->getFamilyName(&familyName);