commit 7e13a6f153615fba04d86c2ad0dccd1b27f88ce2
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Oct 31 23:02:37 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 31 23:02:37 2017 +0000
tree a934a030f37be2ddd274601cfd4f227931b20a49
parent 15b519ba6d498e6ed7fd4e6fac61bb0b3eb7324c
parent b1154d14ac8055f77e861c7ec8ef9c9f63c3a899

Merge "Compute crop using all ancestors, not just immediate parent"

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 56328c9..3e7da38 100755
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -546,6 +546,13 @@
             activeCrop.clear();
         }
     }
+
+    const auto& p = mDrawingParent.promote();
+    if (p != nullptr) {
+        auto parentCrop = p->computeInitialCrop(hw);
+        activeCrop.intersect(parentCrop, &activeCrop);
+    }
+
     return activeCrop;
 }
 
@@ -559,11 +566,6 @@
 
     // Screen space to make reduction to parent crop clearer.
     Rect activeCrop = computeInitialCrop(hw);
-    const auto& p = mDrawingParent.promote();
-    if (p != nullptr) {
-        auto parentCrop = p->computeInitialCrop(hw);
-        activeCrop.intersect(parentCrop, &activeCrop);
-    }
     Transform t = getTransform();
     // Back to layer space to work with the content crop.
     activeCrop = t.inverse().transform(activeCrop);