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

Commit c9e22e9a authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

Switch to SkSafeUnref for better portability 

Change-Id: Ia146a4728b5eb92626462effe42521ca73454a7d
parent 87d86044

core/jni/android/graphics/Bitmap.cpp

+2 −2
Original line number Diff line number Diff line
@@ -363,12 +363,12 @@ static jobject Bitmap_createFromParcel(JNIEnv* env, jobject, jobject parcel) { 
    }



    if (!GraphicsJNI::setJavaPixelRef(env, bitmap, ctable, true)) {

        ctable->safeUnref();

        SkSafeUnref(ctable);

        delete bitmap;

        return NULL;

    }



    ctable->safeUnref();

    SkSafeUnref(ctable);



    size_t size = bitmap->getSize();

    bitmap->lockPixels();

core/jni/android/graphics/Canvas.cpp

+1 −1
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ public: 
        }

        SkShader* shader = SkShader::CreateBitmapShader(*bitmap,

                        SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);

        tmpPaint.setShader(shader)->safeUnref();

        SkSafeUnref(tmpPaint.setShader(shader));



        canvas->drawVertices(SkCanvas::kTriangles_VertexMode, ptCount, verts,

                             texs, (const SkColor*)colorA.ptr(), NULL, indices,

core/jni/android/graphics/ColorFilter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ class SkColorFilterGlue { 
public:



    static void finalizer(JNIEnv* env, jobject clazz, SkColorFilter* obj) {

        obj->safeUnref();

        SkSafeUnref(obj);

    }



    static SkColorFilter* CreatePorterDuffFilter(JNIEnv* env, jobject,

core/jni/android/graphics/DrawFilter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ class SkDrawFilterGlue { 
public:



    static void finalizer(JNIEnv* env, jobject clazz, SkDrawFilter* obj) {

        obj->safeUnref();

        SkSafeUnref(obj);

    }



    static SkDrawFilter* CreatePaintFlagsDF(JNIEnv* env, jobject clazz,

core/jni/android/graphics/MaskFilter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ static void ThrowIAE_IfNull(JNIEnv* env, void* ptr) { 
class SkMaskFilterGlue {

public:

    static void destructor(JNIEnv* env, jobject, SkMaskFilter* filter) {

        filter->safeUnref();

        SkSafeUnref(filter);

    }



    static SkMaskFilter* createBlur(JNIEnv* env, jobject, float radius, int blurStyle) {