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

Commit 6212a4f2 authored by Raph Levien's avatar Raph Levien
Browse files

Fix broken build when DEBUG_GLYPHS is set 

Some of the logging lines referred to the "path" variable which no
longer exists. We log the Harfbuzz script instead, which hopefully
provides enough context.

This change only affects debug builds, but we will want to be working
intensively in this space.

Change-Id: I86c3b58c9fa2a8c47812ef5f0b5ce64fd8dcdc20
parent c436c17c

core/jni/android/graphics/TextLayoutCache.cpp

+2 −2
Original line number Diff line number Diff line
@@ -966,13 +966,13 @@ SkTypeface* TextLayoutShaper::getCachedTypeface(SkTypeface** typeface, HB_Script 
        // CreateFromFile(path) can return NULL if the path is non existing

        if (!*typeface) {

#if DEBUG_GLYPHS

        ALOGD("Font path '%s' is not valid, will use default font", path);

        ALOGD("No font for Harfbuzz script %d, will use default font", script);

#endif

            return mDefaultTypeface;

        }

        (*typeface)->ref();

#if DEBUG_GLYPHS

        ALOGD("Created SkTypeface from file '%s' with uniqueID = %d", path, (*typeface)->uniqueID());

        ALOGD("Created SkTypeface for Harfbuzz script %d with uniqueID = %d", script, (*typeface)->uniqueID());

#endif

    }

    return *typeface;