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

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

Merge "Skia Merge (revision 808)"

parents e857cc81 6062c591

core/jni/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ LOCAL_SHARED_LIBRARIES := \ 
	libgui \

	libsurfaceflinger_client \

	libcamera_client \

	libskiagl \

	libskia \

	libsqlite \

	libdvm \

core/jni/android/graphics/Bitmap.cpp

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


    jbyteArray buffer = GraphicsJNI::allocateJavaPixelRef(env, bitmap, ctable);

    if (NULL == buffer) {

        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
@@ -673,7 +673,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
@@ -33,7 +33,7 @@ using namespace uirenderer; 
class SkColorFilterGlue {

public:

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

        obj->safeUnref();

        SkSafeUnref(obj);

        // f == NULL when not !USE_OPENGL_RENDERER, so no need to delete outside the ifdef

#ifdef USE_OPENGL_RENDERER

        if (android::uirenderer::Caches::hasInstance()) {

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,