From e4ac2d6b5723c95e648c489b187ddde449452c13 Mon Sep 17 00:00:00 2001 From: Patrick Dubroy Date: Wed, 1 Dec 2010 11:23:13 -0800 Subject: Allocate bitmap backing buffers in the Java heap. Change-Id: I60f6ccff13357c1c518e9d56b02fe0171637edd1 --- libs/hwui/ResourceCache.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'libs/hwui/ResourceCache.cpp') diff --git a/libs/hwui/ResourceCache.cpp b/libs/hwui/ResourceCache.cpp index 00de39b3068b..1c93ea644ef4 100644 --- a/libs/hwui/ResourceCache.cpp +++ b/libs/hwui/ResourceCache.cpp @@ -60,7 +60,9 @@ void ResourceCache::incrementRefcount(void* resource, ResourceType resourceType) } void ResourceCache::incrementRefcount(SkBitmap* bitmapResource) { - bitmapResource->pixelRef()->safeRef(); + SkPixelRef* pixref = bitmapResource->pixelRef(); + if (pixref) pixref->globalRef(); + bitmapResource->getColorTable()->safeRef(); incrementRefcount((void*)bitmapResource, kBitmap); } @@ -89,7 +91,9 @@ void ResourceCache::decrementRefcount(void* resource) { } void ResourceCache::decrementRefcount(SkBitmap* bitmapResource) { - bitmapResource->pixelRef()->safeUnref(); + SkPixelRef* pixref = bitmapResource->pixelRef(); + if (pixref) pixref->globalUnref(); + bitmapResource->getColorTable()->safeUnref(); decrementRefcount((void*)bitmapResource); } -- cgit v1.2.3-59-g8ed1b