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

Commit 42d530f1 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Fix native crash in SkiaShader."

parents f61f33dd 6c07daf8

libs/hwui/SkiaShader.cpp

+0 −8
Original line number Diff line number Diff line
@@ -78,9 +78,6 @@ SkiaBitmapShader::SkiaBitmapShader(SkBitmap* bitmap, SkShader* key, SkShader::Ti 
        SkiaShader(kBitmap, key, tileX, tileY, matrix, blend), mBitmap(bitmap) {

}



SkiaBitmapShader::~SkiaBitmapShader() {

}



void SkiaBitmapShader::describe(ProgramDescription& description, const Extensions& extensions) {

    const Texture* texture = mTextureCache->get(mBitmap);
@@ -190,11 +187,6 @@ SkiaComposeShader::SkiaComposeShader(SkiaShader* first, SkiaShader* second, 
        NULL, first->blend() || second->blend()), mFirst(first), mSecond(second), mMode(mode) {

}



SkiaComposeShader::~SkiaComposeShader() {

    delete mFirst;

    delete mSecond;

}



void SkiaComposeShader::set(TextureCache* textureCache, GradientCache* gradientCache) {

    SkiaShader::set(textureCache, gradientCache);

    mFirst->set(textureCache, gradientCache);

libs/hwui/SkiaShader.h

+0 −2
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ protected: 
struct SkiaBitmapShader: public SkiaShader {

    SkiaBitmapShader(SkBitmap* bitmap, SkShader* key, SkShader::TileMode tileX,

            SkShader::TileMode tileY, SkMatrix* matrix, bool blend);

    ~SkiaBitmapShader();



    void describe(ProgramDescription& description, const Extensions& extensions);

    void setupProgram(Program* program, const mat4& modelView, const Snapshot& snapshot,
@@ -143,7 +142,6 @@ private: 
 */

struct SkiaComposeShader: public SkiaShader {

    SkiaComposeShader(SkiaShader* first, SkiaShader* second, SkXfermode::Mode mode, SkShader* key);

    ~SkiaComposeShader();



    void set(TextureCache* textureCache, GradientCache* gradientCache);