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

Commit 1a4bf833 authored by Nolan Scobie's avatar Nolan Scobie Committed by Automerger Merge Worker
Browse files

Merge "Fix Canvas#drawVertices color blending when no shader is provided" into... 

Merge "Fix Canvas#drawVertices color blending when no shader is provided" into tm-qpr-dev am: 716c5618

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19558695



Change-Id: I759f579b9e468673c85d9388f5165826e85562f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c0bc3d8 716c5618

libs/hwui/jni/android_graphics_Canvas.cpp

+21 −7
Original line number Diff line number Diff line
@@ -407,14 +407,28 @@ static void drawVertices(JNIEnv* env, jobject, jlong canvasHandle, 
        indices = (const uint16_t*)(indexA.ptr() + indexIndex);

    }



    SkVertices::VertexMode mode = static_cast<SkVertices::VertexMode>(modeHandle);

    SkVertices::VertexMode vertexMode = static_cast<SkVertices::VertexMode>(modeHandle);

    const Paint* paint = reinterpret_cast<Paint*>(paintHandle);

    get_canvas(canvasHandle)->drawVertices(SkVertices::MakeCopy(mode, vertexCount,

                                           reinterpret_cast<const SkPoint*>(verts),



    // Preserve legacy Skia behavior: ignore the shader if there are no texs set.

    Paint noShaderPaint;

    if (jtexs == NULL) {

        noShaderPaint = Paint(*paint);

        noShaderPaint.setShader(nullptr);

        paint = &noShaderPaint;

    }

    // Since https://skia-review.googlesource.com/c/skia/+/473676, Skia will blend paint and vertex

    // colors when no shader is provided. This ternary uses kDst to mimic the old behavior of

    // ignoring the paint and using the vertex colors directly when no shader is provided.

    SkBlendMode blendMode = paint->getShader() ? SkBlendMode::kModulate : SkBlendMode::kDst;



    get_canvas(canvasHandle)

            ->drawVertices(SkVertices::MakeCopy(

                                   vertexMode, vertexCount, reinterpret_cast<const SkPoint*>(verts),

                                   reinterpret_cast<const SkPoint*>(texs),

                                           reinterpret_cast<const SkColor*>(colors),

                                           indexCount, indices).get(),

                                           SkBlendMode::kModulate, *paint);

                                   reinterpret_cast<const SkColor*>(colors), indexCount, indices)

                                   .get(),

                           blendMode, *paint);

}



static void drawNinePatch(JNIEnv* env, jobject, jlong canvasHandle, jlong bitmapHandle,