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

Commit 8fdd03e6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update to new factories for effects"

parents a3b19870 1c2f5fcc

core/jni/android/graphics/ColorFilter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public: 


    static jlong CreateBlendModeFilter(JNIEnv* env, jobject, jint srcColor, jint modeHandle) {

        SkBlendMode mode = static_cast<SkBlendMode>(modeHandle);

        return reinterpret_cast<jlong>(SkColorFilter::MakeModeFilter(srcColor, mode).release());

        return reinterpret_cast<jlong>(SkColorFilters::Blend(srcColor, mode).release());

    }



    static jlong CreateLightingFilter(JNIEnv* env, jobject, jint mul, jint add) {
@@ -50,7 +50,7 @@ public: 
        const float* src = autoArray.ptr();



#ifdef SK_SCALAR_IS_FLOAT

        return reinterpret_cast<jlong>(SkColorFilter::MakeMatrixFilterRowMajor255(src).release());

        return reinterpret_cast<jlong>(SkColorFilters::MatrixRowMajor255(src).release());

#else

        SkASSERT(false);

#endif

core/jni/android/graphics/Shader.cpp

+5 −5
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static jlong BitmapShader_constructor(JNIEnv* env, jobject o, jlong matrixPtr, j 
        image = SkMakeImageFromRasterBitmap(bitmap, kNever_SkCopyPixelsMode);

    }

    sk_sp<SkShader> shader = image->makeShader(

            (SkShader::TileMode)tileModeX, (SkShader::TileMode)tileModeY);

            (SkTileMode)tileModeX, (SkTileMode)tileModeY);

    ThrowIAE_IfNull(env, shader.get());



    if (matrix) {
@@ -122,7 +122,7 @@ static jlong LinearGradient_create(JNIEnv* env, jobject, jlong matrixPtr, 


    sk_sp<SkShader> shader(SkGradientShader::MakeLinear(pts, &colors[0],

                GraphicsJNI::getNativeColorSpace(colorSpaceHandle), pos, colors.size(),

                static_cast<SkShader::TileMode>(tileMode), sGradientShaderFlags, nullptr));

                static_cast<SkTileMode>(tileMode), sGradientShaderFlags, nullptr));

    ThrowIAE_IfNull(env, shader);



    const SkMatrix* matrix = reinterpret_cast<const SkMatrix*>(matrixPtr);
@@ -152,7 +152,7 @@ static jlong RadialGradient_create(JNIEnv* env, jobject, jlong matrixPtr, jfloat 


    sk_sp<SkShader> shader = SkGradientShader::MakeRadial(center, radius, &colors[0],

            GraphicsJNI::getNativeColorSpace(colorSpaceHandle), pos, colors.size(),

            static_cast<SkShader::TileMode>(tileMode), sGradientShaderFlags, nullptr);

            static_cast<SkTileMode>(tileMode), sGradientShaderFlags, nullptr);

    ThrowIAE_IfNull(env, shader);



    const SkMatrix* matrix = reinterpret_cast<const SkMatrix*>(matrixPtr);
@@ -197,8 +197,8 @@ static jlong ComposeShader_create(JNIEnv* env, jobject o, jlong matrixPtr, 
    SkShader* shaderA = reinterpret_cast<SkShader *>(shaderAHandle);

    SkShader* shaderB = reinterpret_cast<SkShader *>(shaderBHandle);

    SkBlendMode mode = static_cast<SkBlendMode>(xfermodeHandle);

    sk_sp<SkShader> baseShader(SkShader::MakeComposeShader(

            sk_ref_sp(shaderA), sk_ref_sp(shaderB), mode));

    sk_sp<SkShader> baseShader(SkShaders::Blend(mode,

            sk_ref_sp(shaderA), sk_ref_sp(shaderB)));



    SkShader* shader;

libs/hwui/CanvasTransform.cpp

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static void applyColorTransform(ColorTransform transform, SkPaint& paint) { 
        // TODO: LRU this or something to avoid spamming new color mode filters

        if (paint.getColorFilter()->asColorMode(&color, &mode)) {

            color = transformColor(transform, color);

            paint.setColorFilter(SkColorFilter::MakeModeFilter(color, mode));

            paint.setColorFilter(SkColorFilters::Blend(color, mode));

        }

    }

}

libs/hwui/SkiaCanvas.cpp

+1 −2
Original line number Diff line number Diff line
@@ -631,8 +631,7 @@ void SkiaCanvas::drawBitmapMesh(Bitmap& bitmap, int meshWidth, int meshHeight, 
    SkPaint& tmpPaint = paintCoW.writeable();



    sk_sp<SkImage> image = bitmap.makeImage();

    sk_sp<SkShader> shader =

            image->makeShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);

    sk_sp<SkShader> shader = image->makeShader();

    tmpPaint.setShader(std::move(shader));



    mCanvas->drawVertices(builder.detach(), SkBlendMode::kModulate,

libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ SkiaCanvas::PaintCoW&& SkiaRecordingCanvas::filterBitmap(PaintCoW&& paint, 


        if (colorSpaceFilter) {

            if (tmpPaint.getColorFilter()) {

                tmpPaint.setColorFilter(SkColorFilter::MakeComposeFilter(

                tmpPaint.setColorFilter(SkColorFilters::Compose(

                        tmpPaint.refColorFilter(), std::move(colorSpaceFilter)));

            } else {

                tmpPaint.setColorFilter(std::move(colorSpaceFilter));