commit 4e76553e1e776a85d1b5b87bab8ca12e67a6d84d
author chaviw <chaviw@google.com> Fri Apr 30 12:11:39 2021 -0500
committer chaviw <chaviw@google.com> Mon May 03 14:52:05 2021 -0500
tree 67def96c9cdafbb84633d7f1f2b6c12ec4b08ede
parent 0021fac86976361657fbc74bc908d548c18511ea

Use transform, width, and height instead of active and requested

Layer was still setting width, height, and transform in the active and
requested geometry structs. Since there's no longer any BQL, there's no
need to use active and requested. Instead port over width, height, and
transform to no longer use the legacy variable.

This also unifies more code and allows winscope to correctly show the
transform for all layer types.

Test: SurfaceFlinger_test
Bug: 185492007
Change-Id: Iee47a9ecffc16069ea7596ace4506e9416da9f20

services/surfaceflinger/SurfaceInterceptor.cpp

diff --git a/services/surfaceflinger/SurfaceInterceptor.cpp b/services/surfaceflinger/SurfaceInterceptor.cpp
index 113f463..c5f1598 100644
--- a/services/surfaceflinger/SurfaceInterceptor.cpp
+++ b/services/surfaceflinger/SurfaceInterceptor.cpp
@@ -130,8 +130,8 @@
     transaction->set_animation(layerFlags & BnSurfaceComposer::eAnimation);
 
     const int32_t layerId(getLayerId(layer));
-    addPositionLocked(transaction, layerId, layer->mCurrentState.active_legacy.transform.tx(),
-                      layer->mCurrentState.active_legacy.transform.ty());
+    addPositionLocked(transaction, layerId, layer->mCurrentState.transform.tx(),
+                      layer->mCurrentState.transform.ty());
     addDepthLocked(transaction, layerId, layer->mCurrentState.z);
     addAlphaLocked(transaction, layerId, layer->mCurrentState.color.a);
     addTransparentRegionLocked(transaction, layerId,