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

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

View File

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