From c9e22e9affec97a8c68f838de29dc7f685d9247b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Thu, 12 May 2011 08:13:50 -0700 Subject: [PATCH] Switch to SkSafeUnref for better portability Change-Id: Ia146a4728b5eb92626462effe42521ca73454a7d --- core/jni/android/graphics/Bitmap.cpp | 4 ++-- core/jni/android/graphics/Canvas.cpp | 2 +- core/jni/android/graphics/ColorFilter.cpp | 2 +- core/jni/android/graphics/DrawFilter.cpp | 2 +- core/jni/android/graphics/MaskFilter.cpp | 2 +- core/jni/android/graphics/PathEffect.cpp | 2 +- core/jni/android/graphics/Rasterizer.cpp | 2 +- core/jni/android/graphics/Shader.cpp | 2 +- core/jni/android/graphics/Xfermode.cpp | 2 +- core/jni/com_google_android_gles_jni_EGLImpl.cpp | 6 +++--- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index 88bbafd772c95..083e3b126ca96 100644 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -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(); diff --git a/core/jni/android/graphics/Canvas.cpp b/core/jni/android/graphics/Canvas.cpp index e1e953634e4a4..6c616894aff42 100644 --- a/core/jni/android/graphics/Canvas.cpp +++ b/core/jni/android/graphics/Canvas.cpp @@ -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, diff --git a/core/jni/android/graphics/ColorFilter.cpp b/core/jni/android/graphics/ColorFilter.cpp index ebfb20929f5f9..5fbf73b2972fc 100644 --- a/core/jni/android/graphics/ColorFilter.cpp +++ b/core/jni/android/graphics/ColorFilter.cpp @@ -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, diff --git a/core/jni/android/graphics/DrawFilter.cpp b/core/jni/android/graphics/DrawFilter.cpp index 496e7124bfa1f..2f9fe7ed3ff67 100644 --- a/core/jni/android/graphics/DrawFilter.cpp +++ b/core/jni/android/graphics/DrawFilter.cpp @@ -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, diff --git a/core/jni/android/graphics/MaskFilter.cpp b/core/jni/android/graphics/MaskFilter.cpp index 455449e5349d1..d3f9b78fecc22 100644 --- a/core/jni/android/graphics/MaskFilter.cpp +++ b/core/jni/android/graphics/MaskFilter.cpp @@ -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) { diff --git a/core/jni/android/graphics/PathEffect.cpp b/core/jni/android/graphics/PathEffect.cpp index 0ecb004e0e2c8..cfa9ce44549b5 100644 --- a/core/jni/android/graphics/PathEffect.cpp +++ b/core/jni/android/graphics/PathEffect.cpp @@ -12,7 +12,7 @@ class SkPathEffectGlue { public: static void destructor(JNIEnv* env, jobject, SkPathEffect* effect) { - effect->safeUnref(); + SkSafeUnref(effect); } static SkPathEffect* Compose_constructor(JNIEnv* env, jobject, diff --git a/core/jni/android/graphics/Rasterizer.cpp b/core/jni/android/graphics/Rasterizer.cpp index db70b5758a9e7..4e1b36aee01cd 100644 --- a/core/jni/android/graphics/Rasterizer.cpp +++ b/core/jni/android/graphics/Rasterizer.cpp @@ -32,7 +32,7 @@ class SkRasterizerGlue { public: static void finalizer(JNIEnv* env, jobject clazz, SkRasterizer* obj) { - obj->safeUnref(); + SkSafeUnref(obj); } }; diff --git a/core/jni/android/graphics/Shader.cpp b/core/jni/android/graphics/Shader.cpp index b09c62b7d2b3e..8dbe83f1122d2 100644 --- a/core/jni/android/graphics/Shader.cpp +++ b/core/jni/android/graphics/Shader.cpp @@ -43,7 +43,7 @@ static int Color_HSVToColor(JNIEnv* env, jobject, int alpha, jfloatArray hsvArra static void Shader_destructor(JNIEnv* env, jobject, SkShader* shader) { - shader->safeUnref(); + SkSafeUnref(shader); } static bool Shader_getLocalMatrix(JNIEnv* env, jobject, const SkShader* shader, SkMatrix* matrix) diff --git a/core/jni/android/graphics/Xfermode.cpp b/core/jni/android/graphics/Xfermode.cpp index 2b53d289b0d3a..976a91fe9b0cb 100644 --- a/core/jni/android/graphics/Xfermode.cpp +++ b/core/jni/android/graphics/Xfermode.cpp @@ -28,7 +28,7 @@ public: static void finalizer(JNIEnv* env, jobject, SkXfermode* obj) { - obj->safeUnref(); + SkSafeUnref(obj); } static SkXfermode* avoid_create(JNIEnv* env, jobject, SkColor opColor, diff --git a/core/jni/com_google_android_gles_jni_EGLImpl.cpp b/core/jni/com_google_android_gles_jni_EGLImpl.cpp index 941ed6394714e..e7ea8c8f63dd8 100644 --- a/core/jni/com_google_android_gles_jni_EGLImpl.cpp +++ b/core/jni/com_google_android_gles_jni_EGLImpl.cpp @@ -290,7 +290,7 @@ static void jni_eglCreatePixmapSurface(JNIEnv *_env, jobject _this, jobject out_ return; } - ref->safeRef(); + SkSafeRef(ref); ref->lockPixels(); egl_native_pixmap_t pixmap; @@ -310,7 +310,7 @@ static void jni_eglCreatePixmapSurface(JNIEnv *_env, jobject _this, jobject out_ _env->SetIntField(out_sur, gSurface_NativePixelRefFieldID, (int)ref); } else { ref->unlockPixels(); - ref->safeUnref(); + SkSafeUnref(ref); } } @@ -430,7 +430,7 @@ static jboolean jni_eglDestroySurface(JNIEnv *_env, jobject _this, jobject displ gSurface_NativePixelRefFieldID)); if (ref) { ref->unlockPixels(); - ref->safeUnref(); + SkSafeUnref(ref); } } return eglDestroySurface(dpy, sur);