From 89ec829908c8ff405b88b82f9e3a67bb53caefa3 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Wed, 18 Sep 2013 15:07:46 -0400 Subject: [PATCH] Update SkTypeface::CreateFromName to handle NULL if familyName does not match This is a multi-project change with a dependency on external/skia bug: 10730965 Change-Id: Ida880a86ebd182a221333bbd85eaa30d047a1618 --- core/jni/android/graphics/Typeface.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core/jni/android/graphics/Typeface.cpp b/core/jni/android/graphics/Typeface.cpp index e056b618bca45..ff62fffc1029b 100644 --- a/core/jni/android/graphics/Typeface.cpp +++ b/core/jni/android/graphics/Typeface.cpp @@ -29,15 +29,17 @@ private: static SkTypeface* Typeface_create(JNIEnv* env, jobject, jstring name, SkTypeface::Style style) { - SkTypeface* face; + SkTypeface* face = NULL; - if (NULL == name) { - face = SkTypeface::CreateFromName(NULL, (SkTypeface::Style)style); - } - else { + if (NULL != name) { AutoJavaStringToUTF8 str(env, name); face = SkTypeface::CreateFromName(str.c_str(), style); } + + // return the default font at the best style if no exact match exists + if (NULL == face) { + face = SkTypeface::CreateFromName(NULL, style); + } return face; }