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

Commit 067bb3b4 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Update TextLayout logging"

parents c0ce6077 abb0f299

core/jni/android/graphics/Canvas.cpp

+1 −9
Original line number Diff line number Diff line
@@ -770,10 +770,6 @@ public: 
        value->computeValues(paint, textArray, start, count, end, flags);

#endif



#if DEBUG_GLYPHS

        logGlyphs(value);

#endif



        doDrawGlyphs(canvas, value->getGlyphs(), 0, value->getGlyphsCount(),

            x, y, flags, paint);

    }
@@ -794,10 +790,6 @@ public: 
        value->computeValues(paint, textArray, start, count, contextCount, flags);

#endif



#if DEBUG_GLYPHS

        logGlyphs(value);

#endif



        doDrawGlyphs(canvas, value->getGlyphs(), 0, value->getGlyphsCount(),

                x, y, flags, paint);

    }

core/jni/android/graphics/TextLayout.h

+0 −8
Original line number Diff line number Diff line
@@ -64,14 +64,6 @@ enum { 
    kDirection_Mask = 0x1

};



static void logGlyphs(sp<TextLayoutCacheValue> value) {

    if (value == NULL) return;

    LOGD("Got glyphs - count=%d", value->getGlyphsCount());

    for (size_t i = 0; i < value->getGlyphsCount(); i++) {

        LOGD("      glyphs[%d]=%d", i, value->getGlyphs()[i]);

    }

}



class TextLayout {

public:

core/jni/android/graphics/TextLayoutCache.cpp

+11 −0
Original line number Diff line number Diff line
@@ -554,6 +554,15 @@ void TextLayoutCacheValue::computeValuesWithHarfbuzz(SkPaint* paint, const UChar 
#endif

}



static void logGlyphs(HB_ShaperItem shaperItem) {

    LOGD("Got glyphs - count=%d", shaperItem.num_glyphs);

    for (size_t i = 0; i < shaperItem.num_glyphs; i++) {

        LOGD("      glyphs[%d]=%d - offset.x=%f offset.y=%f", i, shaperItem.glyphs[i],

                HBFixedToFloat(shaperItem.offsets[i].x),

                HBFixedToFloat(shaperItem.offsets[i].y));

    }

}



void TextLayoutCacheValue::computeRunValuesWithHarfbuzz(SkPaint* paint, const UChar* chars,

        size_t start, size_t count, size_t contextCount, bool isRTL,

        jfloat* outAdvances, jfloat* outTotalAdvance,
@@ -570,6 +579,8 @@ void TextLayoutCacheValue::computeRunValuesWithHarfbuzz(SkPaint* paint, const UC 
            shaperItem.kerning_applied);

    LOGD("         -- string= '%s'", String8(chars + start, count).string());

    LOGD("         -- isDevKernText=%d", paint->isDevKernText());



    logGlyphs(shaperItem);

#endif



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

core/jni/android_view_GLES20Canvas.cpp

+0 −6
Original line number Diff line number Diff line
@@ -471,9 +471,6 @@ static void renderText(OpenGLRenderer* renderer, const jchar* text, int count, 
#else

    value = new TextLayoutCacheValue();

    value->computeValues(paint, text, 0, count, count, flags);

#endif

#if DEBUG_GLYPHS

    logGlyphs(value);

#endif

    const jchar* glyphArray = value->getGlyphs();

    int glyphCount = value->getGlyphsCount();
@@ -504,9 +501,6 @@ static void renderTextRun(OpenGLRenderer* renderer, const jchar* text, 
#else

    value = new TextLayoutCacheValue();

    value->computeValues(paint, text, start, count, contextCount, flags);

#endif

#if DEBUG_GLYPHS

    logGlyphs(value);

#endif

    const jchar* glyphArray = value->getGlyphs();

    int glyphCount = value->getGlyphsCount();