commit 41707d01e9e950ebd00642ef3564edcff8c539e7
author John Reck <jreck@google.com> Thu Oct 23 20:41:07 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 23 20:41:07 2014 +0000
tree b6e570bb7ebe0f7f5a4b519de0e2ae11f7875d50
parent 74edbeab49cdfc7f12043716d4999acba9f8ce80
parent ebcfd24b8f1fc8e000a08c0bbce3a4215083ae8a

am ebcfd24b: am 68335df6: Merge "Fix damage bug" into lmp-mr1-dev

* commit 'ebcfd24b8f1fc8e000a08c0bbce3a4215083ae8a':
  Fix damage bug

libs/hwui/RenderNode.cpp

diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index 70ff6e5..40cd13e 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -296,6 +296,9 @@
                 mStagingDisplayListData->children()[i]->mRenderNode->incParentRefCount();
             }
         }
+        // Damage with the old display list first then the new one to catch any
+        // changes in isRenderable or, in the future, bounds
+        damageSelf(info);
         deleteDisplayListData();
         mDisplayListData = mStagingDisplayListData;
         mStagingDisplayListData = NULL;