summaryrefslogtreecommitdiff
path: root/libs/hwui/ResourceCache.cpp
diff options
context:
space:
mode:
author Dave Burke <daveburke@google.com> 2012-09-25 20:30:09 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-09-25 20:30:09 -0700
commit56257aff8a55c847be72be9924c392033fd8151d (patch)
tree5e31b76ebbf03e281ccaeceec24882660e7de47e /libs/hwui/ResourceCache.cpp
parent8a1374946a928fcba7495c87ff6adda327fdfb9f (diff)
Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815"
This reverts commit 8a1374946a928fcba7495c87ff6adda327fdfb9f Change-Id: I53564a6c531d334afcc1fce0bea1e57ae266aa78
Diffstat (limited to 'libs/hwui/ResourceCache.cpp')
-rw-r--r--libs/hwui/ResourceCache.cpp6
1 files changed, 3 insertions, 3 deletions
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;
}