Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Chcek for valid render content before damaging RenderNode for dirty VD\" into nyc-mr1-dev

Browse Source 
am: d53dd6fd3f

Change-Id: If41865d28e7f57258c40c0b087d9f70a823c38e9
This commit is contained in:
Doris Liu
2016-06-13 22:39:09 +00:00
committed by android-build-merger
parent f33506a4c9 d53dd6fd3f
commit 9559ef45e7
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/hwui/RenderNode.cpp
View File

@@ -421,12 +421,14 @@ void RenderNode::prepareTreeImpl(TreeInfo& info, bool functorsNeedLayer) {
prepareSubTree(info, childFunctorsNeedLayer, mDisplayList); prepareSubTree(info, childFunctorsNeedLayer, mDisplayList);
pushLayerUpdate(info); pushLayerUpdate(info);
for (auto& vectorDrawable : mDisplayList->getVectorDrawables()) { if (mDisplayList) {
// If any vector drawable in the display list needs update, damage the node. for (auto& vectorDrawable : mDisplayList->getVectorDrawables()) {
if (vectorDrawable->isDirty()) { // If any vector drawable in the display list needs update, damage the node.
damageSelf(info); if (vectorDrawable->isDirty()) {
damageSelf(info);
}
vectorDrawable->setPropertyChangeWillBeConsumed(true);
} }
vectorDrawable->setPropertyChangeWillBeConsumed(true);
} }
info.damageAccumulator->popTransform(); info.damageAccumulator->popTransform();