diff options
| author | John Reck <jreck@google.com> | 2014-10-23 20:48:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-23 20:48:43 +0000 |
| commit | 945701126bedff0786f540c41c63c9af37fbbe73 (patch) | |
| tree | bf505580a3f4e22c66806f4f7d558d6e78e528ab /libs/hwui/RenderNode.cpp | |
| parent | c193acb8cbcb1a79f3d7deb699fbefeaef261c96 (diff) | |
| parent | 41707d01e9e950ebd00642ef3564edcff8c539e7 (diff) | |
| download | frameworks_base-945701126bedff0786f540c41c63c9af37fbbe73.zip frameworks_base-945701126bedff0786f540c41c63c9af37fbbe73.tar.gz frameworks_base-945701126bedff0786f540c41c63c9af37fbbe73.tar.bz2 | |
am 41707d01: am ebcfd24b: am 68335df6: Merge "Fix damage bug" into lmp-mr1-dev
* commit '41707d01e9e950ebd00642ef3564edcff8c539e7':
Fix damage bug
Diffstat (limited to 'libs/hwui/RenderNode.cpp')
| -rw-r--r-- | libs/hwui/RenderNode.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 5139020..88b64b5 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -297,6 +297,9 @@ void RenderNode::pushStagingDisplayListChanges(TreeInfo& info) { 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; |