Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix native resource leak when OpenGL renderer is not being used."

Browse Source
This commit is contained in:
Chet Haase
2010-10-22 09:07:13 -07:00
committed by Android (Google) Code Review
parent ea70e63c0d 27f0b17d85
commit 0865f7629a
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/android/graphics/Bitmap.cpp
View File

@@ -256,20 +256,20 @@ static void Bitmap_destructor(JNIEnv* env, jobject, SkBitmap* bitmap) {
#ifdef USE_OPENGL_RENDERER
if (android::uirenderer::Caches::hasInstance()) {
android::uirenderer::Caches::getInstance().resourceCache.destructor(bitmap);
return;
}
#else // !USE_OPENGL_RENDERER
#endif // USE_OPENGL_RENDERER
delete bitmap;
#endif
}
static void Bitmap_recycle(JNIEnv* env, jobject, SkBitmap* bitmap) {
#ifdef USE_OPENGL_RENDERER
if (android::uirenderer::Caches::hasInstance()) {
android::uirenderer::Caches::getInstance().resourceCache.recycle(bitmap);
return;
}
#else // !USE_OPENGL_RENDERER
bitmap->setPixels(NULL, NULL);
#endif // USE_OPENGL_RENDERER
bitmap->setPixels(NULL, NULL);
}
// These must match the int values in Bitmap.java

4
core/jni/android/graphics/Matrix.cpp
View File

@@ -35,10 +35,10 @@ public:
#ifdef USE_OPENGL_RENDERER
if (android::uirenderer::Caches::hasInstance()) {
android::uirenderer::Caches::getInstance().resourceCache.destructor(obj);
return;
}
#else // !USE_OPENGL_RENDERER
#endif // USE_OPENGL_RENDERER
delete obj;
#endif
}
static SkMatrix* create(JNIEnv* env, jobject clazz, const SkMatrix* src) {

4
core/jni/android/graphics/Paint.cpp
View File

@@ -66,10 +66,10 @@ public:
#ifdef USE_OPENGL_RENDERER
if (android::uirenderer::Caches::hasInstance()) {
android::uirenderer::Caches::getInstance().resourceCache.destructor(obj);
return;
}
#else // !USE_OPENGL_RENDERER
#endif // USE_OPENGL_RENDERER
delete obj;
#endif
}
static SkPaint* init(JNIEnv* env, jobject clazz) {