From 56257aff8a55c847be72be9924c392033fd8151d Mon Sep 17 00:00:00 2001 From: Dave Burke Date: Tue, 25 Sep 2012 20:30:09 -0700 Subject: Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815" This reverts commit 8a1374946a928fcba7495c87ff6adda327fdfb9f Change-Id: I53564a6c531d334afcc1fce0bea1e57ae266aa78 --- libs/hwui/ResourceCache.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/hwui/ResourceCache.cpp') diff --git a/libs/hwui/ResourceCache.cpp b/libs/hwui/ResourceCache.cpp index 39e64bce9c24..18d8324b8488 100644 --- a/libs/hwui/ResourceCache.cpp +++ b/libs/hwui/ResourceCache.cpp @@ -325,9 +325,9 @@ void ResourceCache::deleteResourceReferenceLocked(void* resource, ResourceRefere } break; case kLayer: { - // No need to check for hasInstance, layers only exist - // when we have a Caches instance - Caches::getInstance().deleteLayerDeferred((Layer*) resource); + Layer* layer = (Layer*) resource; + layer->freeResourcesLocked(); + delete layer; } break; } -- cgit v1.2.3-59-g8ed1b