Merge "Remove unnecessary/erroneous reference counting" into lmp-mr1-dev (04c2bf4f) · Commits · e / os / android_frameworks_base

libs/hwui/ResourceCache.cpp

+0 −8

Original line number	Diff line number	Diff line
		@@ -68,8 +68,6 @@ void ResourceCache::incrementRefcount(void* resource, ResourceType resourceType)
		}

		void ResourceCache::incrementRefcount(const SkBitmap* bitmapResource) {
		bitmapResource->pixelRef()->globalRef();
		SkSafeRef(bitmapResource->getColorTable());
		incrementRefcount((void*) bitmapResource, kBitmap);
		}

		@@ -92,8 +90,6 @@ void ResourceCache::incrementRefcountLocked(void* resource, ResourceType resourc
		}

		void ResourceCache::incrementRefcountLocked(const SkBitmap* bitmapResource) {
		bitmapResource->pixelRef()->globalRef();
		SkSafeRef(bitmapResource->getColorTable());
		incrementRefcountLocked((void*) bitmapResource, kBitmap);
		}

		@@ -111,8 +107,6 @@ void ResourceCache::decrementRefcount(void* resource) {
		}

		void ResourceCache::decrementRefcount(const SkBitmap* bitmapResource) {
		bitmapResource->pixelRef()->globalUnref();
		SkSafeUnref(bitmapResource->getColorTable());
		decrementRefcount((void*) bitmapResource);
		}

		@@ -138,8 +132,6 @@ void ResourceCache::decrementRefcountLocked(void* resource) {
		}

		void ResourceCache::decrementRefcountLocked(const SkBitmap* bitmapResource) {
		bitmapResource->pixelRef()->globalUnref();
		SkSafeUnref(bitmapResource->getColorTable());
		decrementRefcountLocked((void*) bitmapResource);
		}