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

Commit f09b746a authored by Chris Craik's avatar Chris Craik
Browse files

Handle all text bounds as post-translated 

We were treating immediate mode bounds as pre translate, which is
inconsistent with using them for quickRejection.

This fixes the overdraw counter not drawing correctly (since it uses
immediate mode drawing.

Change-Id: I1c734d367a00942bd7d9b041822c0a9f284e70a8
parent 4aaf8b3d

core/jni/android_view_GLES20Canvas.cpp

+2 −0
Original line number Diff line number Diff line
@@ -602,6 +602,7 @@ static void renderText(OpenGLRenderer* renderer, const jchar* text, int count, 
    int bytesCount = glyphsCount * sizeof(jchar);

    const SkRect& r = value->getBounds();

    android::uirenderer::Rect bounds(r.fLeft, r.fTop, r.fRight, r.fBottom);

    bounds.translate(x, y);



    renderer->drawText((const char*) glyphs, bytesCount, glyphsCount,

            x + xOffsetForTextAlign(paint, totalAdvance), y, positions,
@@ -637,6 +638,7 @@ static void renderTextRun(OpenGLRenderer* renderer, const jchar* text, 
    int bytesCount = glyphsCount * sizeof(jchar);

    const SkRect& r = value->getBounds();

    android::uirenderer::Rect bounds(r.fLeft, r.fTop, r.fRight, r.fBottom);

    bounds.translate(x, y);



    renderer->drawText((const char*) glyphs, bytesCount, glyphsCount,

            x + xOffsetForTextAlign(paint, totalAdvance), y, positions,

libs/hwui/DisplayListOp.h

+0 −1
Original line number Diff line number Diff line
@@ -1292,7 +1292,6 @@ public: 
            const float* positions, SkPaint* paint, float totalAdvance, const Rect& bounds)

            : DrawBoundedOp(bounds, paint), mText(text), mBytesCount(bytesCount), mCount(count),

            mX(x), mY(y), mPositions(positions), mTotalAdvance(totalAdvance) {

        mLocalBounds.translate(x,y);

        memset(&mPrecacheTransform.data[0], 0xff, 16 * sizeof(float));

    }