Merge "Check ProjectBackwards property for childrens after children's syncProperties()." am: b22ef02f1f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550595

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifdf268e87ef8f77260e900f127762ca458e5d599
This commit is contained in:
Treehugger Robot
2021-01-19 17:36:45 +00:00
committed by Automerger Merge Worker

View File

@@ -102,12 +102,12 @@ bool SkiaDisplayList::prepareListAndChildren(
bool hasBackwardProjectedNodesSubtree = false; bool hasBackwardProjectedNodesSubtree = false;
for (auto& child : mChildNodes) { for (auto& child : mChildNodes) {
hasBackwardProjectedNodesHere |= child.getNodeProperties().getProjectBackwards();
RenderNode* childNode = child.getRenderNode(); RenderNode* childNode = child.getRenderNode();
Matrix4 mat4(child.getRecordedMatrix()); Matrix4 mat4(child.getRecordedMatrix());
info.damageAccumulator->pushTransform(&mat4); info.damageAccumulator->pushTransform(&mat4);
info.hasBackwardProjectedNodes = false; info.hasBackwardProjectedNodes = false;
childFn(childNode, observer, info, functorsNeedLayer); childFn(childNode, observer, info, functorsNeedLayer);
hasBackwardProjectedNodesHere |= child.getNodeProperties().getProjectBackwards();
hasBackwardProjectedNodesSubtree |= info.hasBackwardProjectedNodes; hasBackwardProjectedNodesSubtree |= info.hasBackwardProjectedNodes;
info.damageAccumulator->popTransform(); info.damageAccumulator->popTransform();
} }