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

* commit '68335df6e6134c919f8575aa52e11872642848ad':
  Fix damage bug
This commit is contained in:
John Reck
2014-10-23 19:47:18 +00:00
committed by Android Git Automerger

View File

@ -296,6 +296,9 @@ void RenderNode::pushStagingDisplayListChanges(TreeInfo& info) {
mStagingDisplayListData->children()[i]->mRenderNode->incParentRefCount(); 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(); deleteDisplayListData();
mDisplayListData = mStagingDisplayListData; mDisplayListData = mStagingDisplayListData;
mStagingDisplayListData = NULL; mStagingDisplayListData = NULL;