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

Commit 57e97231 authored by Raph Levien's avatar Raph Levien
Browse files

Partial fix for bug 6132077 (incorrect line breaking of Arabic text). 

Fixed getTextRunAdvances so that advances are correctly aligned with
UTF-16 code point offices, rather than runs being reversed in RTL.

Change-Id: Ife59c0c26f745654c16656c86072e9102d8f6bc7
parent 1579a67e

core/jni/android/graphics/TextLayoutCache.cpp

+8 −17
Original line number Diff line number Diff line
@@ -550,6 +550,10 @@ void TextLayoutShaper::computeRunValues(const SkPaint* paint, const UChar* chars 
        return;

    }



    // To be filled in later

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

        outAdvances->add(0);

    }

    UErrorCode error = U_ZERO_ERROR;

    bool useNormalizedString = false;

    for (ssize_t i = count - 1; i >= 0; --i) {
@@ -691,23 +695,11 @@ void TextLayoutShaper::computeRunValues(const SkPaint* paint, const UChar* chars 


        logGlyphs(mShaperItem);

#endif

        if (isRTL) {

            endScriptRun = startScriptRun;

#if DEBUG_GLYPHS

            ALOGD("Updated endScriptRun = %d", int(endScriptRun));

#endif

        } else {

            startScriptRun = endScriptRun;

#if DEBUG_GLYPHS

            ALOGD("Updated startScriptRun = %d", int(startScriptRun));

#endif

        }



        if (mShaperItem.advances == NULL || mShaperItem.num_glyphs == 0) {

#if DEBUG_GLYPHS

            ALOGD("Advances array is empty or num_glypth = 0");

#endif

            outAdvances->insertAt(0, outAdvances->size(), countScriptRun);

            continue;

        }
@@ -721,15 +713,13 @@ void TextLayoutShaper::computeRunValues(const SkPaint* paint, const UChar* chars 
        // Get Advances and their total

        jfloat currentAdvance = HBFixedToFloat(mShaperItem.advances[mShaperItem.log_clusters[0]]);

        jfloat totalFontRunAdvance = currentAdvance;

        outAdvances->add(currentAdvance);

        outAdvances->replaceAt(currentAdvance, startScriptRun);

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

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

            size_t cluster = mShaperItem.log_clusters[i];

            if (cluster == clusterPrevious) {

                outAdvances->add(0);

            } else {

            if (cluster != clusterPrevious) {

                currentAdvance = HBFixedToFloat(mShaperItem.advances[mShaperItem.log_clusters[i]]);

                outAdvances->add(currentAdvance);

                outAdvances->replaceAt(currentAdvance, startScriptRun + i);

            }

        }

        // TODO: can be removed and go back in the previous loop when Harfbuzz log clusters are fixed
@@ -746,6 +736,7 @@ void TextLayoutShaper::computeRunValues(const SkPaint* paint, const UChar* chars 
                    (*outAdvances)[i], mShaperItem.log_clusters[i], totalFontRunAdvance);

        }

#endif



        // Get Glyphs and reverse them in place if RTL

        if (outGlyphs) {

            size_t countGlyphs = mShaperItem.num_glyphs;