commit 56f018b1e42d48410c991d3aefdcc07c6f3564db
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 19 17:36:45 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 19 17:36:45 2021 +0000
tree eb8aa3c3ecbf27e1b309a8ba3a5b4c46aa1b1d90
parent 03047824e4ec3cd1f65184131c1dc504ec84e06b
parent b22ef02f1f3d49d2b2cab67a182db33d837eee30

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

libs/hwui/pipeline/skia/SkiaDisplayList.cpp

diff --git a/libs/hwui/pipeline/skia/SkiaDisplayList.cpp b/libs/hwui/pipeline/skia/SkiaDisplayList.cpp
index 158c349..2edd48c 100644
--- a/libs/hwui/pipeline/skia/SkiaDisplayList.cpp
+++ b/libs/hwui/pipeline/skia/SkiaDisplayList.cpp
@@ -102,12 +102,12 @@
     bool hasBackwardProjectedNodesSubtree = false;
 
     for (auto& child : mChildNodes) {
-        hasBackwardProjectedNodesHere |= child.getNodeProperties().getProjectBackwards();
         RenderNode* childNode = child.getRenderNode();
         Matrix4 mat4(child.getRecordedMatrix());
         info.damageAccumulator->pushTransform(&mat4);
         info.hasBackwardProjectedNodes = false;
         childFn(childNode, observer, info, functorsNeedLayer);
+        hasBackwardProjectedNodesHere |= child.getNodeProperties().getProjectBackwards();
         hasBackwardProjectedNodesSubtree |= info.hasBackwardProjectedNodes;
         info.damageAccumulator->popTransform();
     }