Merge "Fix garbage deref in DisplayList structures"

2012-03-13 11:16:03 -07:00
parent 0657813970 866ed817d0
commit 8d4ada4cd3
1 changed files with 13 additions and 11 deletions
--- a/libs/hwui/DisplayListRenderer.cpp
+++ b/libs/hwui/DisplayListRenderer.cpp
@@ -140,17 +140,19 @@ void DisplayList::destroyDisplayListDeferred(DisplayList* displayList) {
 void DisplayList::clearResources() {
    sk_free((void*) mReader.base());

-    if (mTransformMatrix) {
-        delete mTransformMatrix;
-        mTransformMatrix = NULL;
-    }
-    if (mTransformCamera) {
-        delete mTransformCamera;
-        mTransformCamera = NULL;
-    }
-    if (mTransformMatrix3D) {
-        delete mTransformMatrix3D;
-        mTransformMatrix3D = NULL;
+    if (USE_DISPLAY_LIST_PROPERTIES) {
+        if (mTransformMatrix) {
+            delete mTransformMatrix;
+            mTransformMatrix = NULL;
+        }
+        if (mTransformCamera) {
+            delete mTransformCamera;
+            mTransformCamera = NULL;
+        }
+        if (mTransformMatrix3D) {
+            delete mTransformMatrix3D;
+            mTransformMatrix3D = NULL;
+        }
    }

    Caches& caches = Caches::getInstance();