Fix issues related to resolving fonts based on name.

src/core/SkTypeface.cpp

Index: src/core/SkTypeface.cpp
diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp
index cc60ca1809189b95667ee843b7b8f1dcebad6998..361f5a99436677ebe57e4ae7d5819a21ea87df9c 100644
--- a/src/core/SkTypeface.cpp
+++ b/src/core/SkTypeface.cpp
@@ -37,21 +37,23 @@ SkTypeface::~SkTypeface() {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkTypeface* SkTypeface::GetDefaultTypeface() {
+SkTypeface* SkTypeface::GetDefaultTypeface(Style style) {
     // we keep a reference to this guy for all time, since if we return its
     // fontID, the font cache may later on ask to resolve that back into a
     // typeface object.
-    static SkTypeface* gDefaultTypeface;
+    static const int FONT_STYLE_COUNT = 4;
+    static SkTypeface* gDefaultTypefaces[FONT_STYLE_COUNT] = {0};

[reed1, 2013/06/05 13:23:57]

nit: don't need {0} as it will automatically be zeroed since its static.

[djsollen, 2013/06/05 13:51:59]

Done.

+    SkASSERT(FONT_STYLE_COUNT > style);

[reed1, 2013/06/05 13:23:57]

nit: I think I always see this compare the other way: value < max

possible warning in some compilers, if the enum gets unsigned. I suggest:

    (unsigned)style < FONT_STYLE_COUNT

where FONT_STYLE_COUNT is also unsigned. This also gives you a free check in
case style is negative.

Also, I wonder if we shouldn't also explicitly mask of any stray bits, just so
we never crash in release mode:

style &= kBoldItalic

[djsollen, 2013/06/05 13:51:59]

Done.

 
-    if (NULL == gDefaultTypeface) {
-        gDefaultTypeface =
-        SkFontHost::CreateTypeface(NULL, NULL, SkTypeface::kNormal);
+    if (NULL == gDefaultTypefaces[style]) {
+        gDefaultTypefaces[style] =
+        SkFontHost::CreateTypeface(NULL, NULL, style);
     }
-    return gDefaultTypeface;
+    return gDefaultTypefaces[style];
 }
 
-SkTypeface* SkTypeface::RefDefault() {
-    return SkRef(GetDefaultTypeface());
+SkTypeface* SkTypeface::RefDefault(Style style) {
+    return SkRef(GetDefaultTypeface(style));
 }
 
 uint32_t SkTypeface::UniqueID(const SkTypeface* face) {
@@ -68,6 +70,9 @@ bool SkTypeface::Equal(const SkTypeface* facea, const SkTypeface* faceb) {
 ///////////////////////////////////////////////////////////////////////////////
 
 SkTypeface* SkTypeface::CreateFromName(const char name[], Style style) {
+    if (NULL == name) {
+        return RefDefault(style);
+    }
     return SkFontHost::CreateTypeface(NULL, name, style);
 }