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

Commit 06732fde authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Return chars advances instead of glyphs advances 

- take care of log_clusters for char/glyph mapping
- remove verbose logs

Change-Id: Id19af2b4a46cc4ada0b99263a3208de14a979ba5
parent f7b9e784

core/jni/android/graphics/RtlProperties.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static RtlDebugLevel readRtlDebugLevel() { 
#define DEBUG_ADVANCES 0



// Define if we want (1) to have Glyphs debug values or not (0)

#define DEBUG_GLYPHS 1

#define DEBUG_GLYPHS 0



} // namespace android

#endif // ANDROID_RTL_PROPERTIES_H

core/jni/android/graphics/TextLayoutCache.cpp

+18 −8
Original line number Diff line number Diff line
@@ -420,7 +420,9 @@ void TextLayoutCacheValue::computeValuesWithHarfbuzz(SkPaint* paint, const UChar 
            UBiDi* bidi = ubidi_open();

            if (bidi) {

                UErrorCode status = U_ZERO_ERROR;

#if DEBUG_GLYPHS

                LOGD("computeValuesWithHarfbuzz -- bidiReq=%d", bidiReq);

#endif

                ubidi_setPara(bidi, chars, contextCount, bidiReq, NULL, &status);

                if (U_SUCCESS(status)) {

                    int paraDir = ubidi_getParaLevel(bidi) & kDirection_Mask; // 0 if ltr, 1 if rtl
@@ -430,7 +432,6 @@ void TextLayoutCacheValue::computeValuesWithHarfbuzz(SkPaint* paint, const UChar 
#endif



                    if (rc == 1 || !U_SUCCESS(status)) {

                        LOGD("HERE !!!");

                        computeRunValuesWithHarfbuzz(paint, chars, start, count, contextCount,

                                dirFlags, outAdvances, outTotalAdvance, outGlyphs, outGlyphsCount);

                        ubidi_close(bidi);
@@ -517,16 +518,25 @@ void TextLayoutCacheValue::computeRunValuesWithHarfbuzz(SkPaint* paint, const UC 
#endif



    // Get Advances and their total

    jfloat totalAdvance = 0;

    for (size_t i = 0; i < count; i++) {

        totalAdvance += outAdvances[i] = HBFixedToFloat(shaperItem.advances[i]);

#if DEBUG_ADVANCES

        LOGD("hb-adv = %d - rebased = %f - total = %f", shaperItem.advances[i], outAdvances[i],

                totalAdvance);

#endif

    jfloat totalAdvance = outAdvances[0] = HBFixedToFloat(shaperItem.advances[shaperItem.log_clusters[0]]);

    for (size_t i = 1; i < count; i++) {

        size_t clusterPrevious = shaperItem.log_clusters[i - 1];

        size_t cluster = shaperItem.log_clusters[i];

        if (cluster == clusterPrevious) {

            outAdvances[i] = 0;

        } else {

            totalAdvance += outAdvances[i] = HBFixedToFloat(shaperItem.advances[shaperItem.log_clusters[i]]);

        }

    }

    *outTotalAdvance = totalAdvance;



#if DEBUG_ADVANCES

    for (size_t i = 0; i < count; i++) {

        LOGD("hb-adv[%d] = %f - log_clusters = %d - total = %f", i,

                outAdvances[i], shaperItem.log_clusters[i], totalAdvance);

    }

#endif



    // Get Glyphs

    if (outGlyphs) {

        *outGlyphsCount = shaperItem.num_glyphs;