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

Commit 5f9dd150 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "Update bitmap shaders to the special no-copy image shaders."

parents bbeb4fc1 450756ab

core/jni/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ LOCAL_C_INCLUDES += \ 
    external/skia/include/private \

    external/skia/src/core \

    external/skia/src/effects \

    external/skia/src/image \

    external/skia/src/images \

    external/sqlite/dist \

    external/sqlite/android \

core/jni/android/graphics/Shader.cpp

+7 −9
Original line number Diff line number Diff line
@@ -95,15 +95,13 @@ static jlong BitmapShader_constructor(JNIEnv* env, jobject o, jobject jbitmap, 
        // we'll pass an empty SkBitmap to avoid crashing/excepting for compatibility.

        GraphicsJNI::getSkBitmap(env, jbitmap, &bitmap);

    }

    sk_sp<SkShader> s = SkMakeBitmapShader(bitmap,

                                           (SkShader::TileMode)tileModeX,

                                           (SkShader::TileMode)tileModeY,

                                           nullptr,

                                           kNever_SkCopyPixelsMode,

                                           nullptr);



    ThrowIAE_IfNull(env, s.get());

    return reinterpret_cast<jlong>(s.release());



    sk_sp<SkImage> image = SkMakeImageFromRasterBitmap(bitmap, kNever_SkCopyPixelsMode);

    sk_sp<SkShader> shader = image->makeShader((SkShader::TileMode)tileModeX,

                                               (SkShader::TileMode)tileModeY);



    ThrowIAE_IfNull(env, shader.get());

    return reinterpret_cast<jlong>(shader.release());

}



///////////////////////////////////////////////////////////////////////////////////////////////