summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorMike Reed <reed@google.com>2009-07-30 16:06:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-07-30 16:06:31 -0700
commita31ce104f557212198cd7c95e05c7b67abcdbe8a (patch)
tree42a69900569501c559b69f83e2c8d9e8f8035cdf /core/jni
parent93efb724ac60538bef3a4e9bae123b515a9deeeb (diff)
parent6af2552d244ff933dfd54570121db455cc7c3cda (diff)
downloadframeworks_base-a31ce104f557212198cd7c95e05c7b67abcdbe8a.zip
frameworks_base-a31ce104f557212198cd7c95e05c7b67abcdbe8a.tar.gz
frameworks_base-a31ce104f557212198cd7c95e05c7b67abcdbe8a.tar.bz2
am 6af2552d: use safeUnref() since the other macro is not defined in donut
Merge commit '6af2552d244ff933dfd54570121db455cc7c3cda' * commit '6af2552d244ff933dfd54570121db455cc7c3cda': use safeUnref() since the other macro is not defined in donut
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/android/graphics/MaskFilter.cpp2
-rw-r--r--core/jni/android/graphics/Shader.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android/graphics/MaskFilter.cpp b/core/jni/android/graphics/MaskFilter.cpp
index 05a6d47..0f8dff1 100644
--- a/core/jni/android/graphics/MaskFilter.cpp
+++ b/core/jni/android/graphics/MaskFilter.cpp
@@ -13,7 +13,7 @@ static void ThrowIAE_IfNull(JNIEnv* env, void* ptr) {
class SkMaskFilterGlue {
public:
static void destructor(JNIEnv* env, jobject, SkMaskFilter* filter) {
- SkSafeUnref(filter);
+ filter->safeUnref();
}
static SkMaskFilter* createBlur(JNIEnv* env, jobject, float radius, int blurStyle) {
diff --git a/core/jni/android/graphics/Shader.cpp b/core/jni/android/graphics/Shader.cpp
index 8dbe83f..b09c62b 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)
{
- SkSafeUnref(shader);
+ shader->safeUnref();
}
static bool Shader_getLocalMatrix(JNIEnv* env, jobject, const SkShader* shader, SkMatrix* matrix)