Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe8e21fd authored by Derek Sollenberger's avatar Derek Sollenberger
Browse files

Fix Java API error where requesting another style for a provided family fails 

Internally the API uses the same code path as SkTypeface::CreateFromName which
returns NULL if the requested style is not supported by the existing family.
However, the existing Java API expects that we return the default font in the
requested style so this CL ensures that we do.

bug: 10860066
Change-Id: Ide3a0cc24015e97fa35aef283b42e7d7d11edd9c
parent f9b70ab8

core/jni/android/graphics/Typeface.cpp

+7 −1
Original line number Diff line number Diff line
@@ -44,7 +44,13 @@ static SkTypeface* Typeface_create(JNIEnv* env, jobject, jstring name, 
}



static SkTypeface* Typeface_createFromTypeface(JNIEnv* env, jobject, SkTypeface* family, int style) {

    return SkTypeface::CreateFromTypeface(family, (SkTypeface::Style)style);

    SkTypeface* face = SkTypeface::CreateFromTypeface(family, (SkTypeface::Style)style);

    // return the default font at the best style if the requested style does not

    // exist in the provided family

    if (NULL == face) {

        face = SkTypeface::CreateFromName(NULL, (SkTypeface::Style)style);

    }

    return face;

}



static void Typeface_unref(JNIEnv* env, jobject obj, SkTypeface* face) {