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

Merge "Remove unnecessary/erroneous reference counting" into lmp-mr1-dev

Browse Source
This commit is contained in:
Derek Sollenberger
2014-12-09 21:27:38 +00:00
committed by Android (Google) Code Review
parent 14c436897c ee648e517f
commit 04c2bf4f17
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/hwui/ResourceCache.cpp
View File

@@ -68,8 +68,6 @@ void ResourceCache::incrementRefcount(void* resource, ResourceType resourceType)
} }
void ResourceCache::incrementRefcount(const SkBitmap* bitmapResource) { void ResourceCache::incrementRefcount(const SkBitmap* bitmapResource) {
bitmapResource->pixelRef()->globalRef();
SkSafeRef(bitmapResource->getColorTable());
incrementRefcount((void*) bitmapResource, kBitmap); incrementRefcount((void*) bitmapResource, kBitmap);
} }
@@ -92,8 +90,6 @@ void ResourceCache::incrementRefcountLocked(void* resource, ResourceType resourc
} }
void ResourceCache::incrementRefcountLocked(const SkBitmap* bitmapResource) { void ResourceCache::incrementRefcountLocked(const SkBitmap* bitmapResource) {
bitmapResource->pixelRef()->globalRef();
SkSafeRef(bitmapResource->getColorTable());
incrementRefcountLocked((void*) bitmapResource, kBitmap); incrementRefcountLocked((void*) bitmapResource, kBitmap);
} }
@@ -111,8 +107,6 @@ void ResourceCache::decrementRefcount(void* resource) {
} }
void ResourceCache::decrementRefcount(const SkBitmap* bitmapResource) { void ResourceCache::decrementRefcount(const SkBitmap* bitmapResource) {
bitmapResource->pixelRef()->globalUnref();
SkSafeUnref(bitmapResource->getColorTable());
decrementRefcount((void*) bitmapResource); decrementRefcount((void*) bitmapResource);
} }
@@ -138,8 +132,6 @@ void ResourceCache::decrementRefcountLocked(void* resource) {
} }
void ResourceCache::decrementRefcountLocked(const SkBitmap* bitmapResource) { void ResourceCache::decrementRefcountLocked(const SkBitmap* bitmapResource) {
bitmapResource->pixelRef()->globalUnref();
SkSafeUnref(bitmapResource->getColorTable());
decrementRefcountLocked((void*) bitmapResource); decrementRefcountLocked((void*) bitmapResource);
} }