commit 9a93ea66bb7116b8821877a69991ae94557b1303
author chaviw <chaviw@google.com> Thu Mar 11 16:44:42 2021 -0600
committer chaviw <chaviw@google.com> Tue Mar 30 15:53:01 2021 -0500
tree 40a457bee0e057406fb8b35ad418383c909812e0
parent 9fc9513410b4b3e6889f5b201e5235ec062bddcd

Remove setFrame from BufferStateLayer

Replace setFrame with setCrop, setMatrix, and setPosition

Test: SurfaceFlinger_tests
Test: ASurfaceControlTest
Bug: 170765639
Change-Id: I32ee0e3e48e5171d99a5f5af0b7583165d4dd9f9

services/surfaceflinger/RefreshRateOverlay.cpp

diff --git a/services/surfaceflinger/RefreshRateOverlay.cpp b/services/surfaceflinger/RefreshRateOverlay.cpp
index 1d00cc3..7a3e433 100644
--- a/services/surfaceflinger/RefreshRateOverlay.cpp
+++ b/services/surfaceflinger/RefreshRateOverlay.cpp
@@ -231,8 +231,14 @@
 void RefreshRateOverlay::setViewport(ui::Size viewport) {
     Rect frame((3 * viewport.width) >> 4, viewport.height >> 5);
     frame.offsetBy(viewport.width >> 5, viewport.height >> 4);
-    mLayer->setFrame(frame);
 
+    layer_state_t::matrix22_t matrix;
+    matrix.dsdx = frame.getWidth() / static_cast<float>(SevenSegmentDrawer::getWidth());
+    matrix.dtdx = 0;
+    matrix.dtdy = 0;
+    matrix.dsdy = frame.getHeight() / static_cast<float>(SevenSegmentDrawer::getHeight());
+    mLayer->setMatrix(matrix, true);
+    mLayer->setPosition(frame.left, frame.top);
     mFlinger.mTransactionFlags.fetch_or(eTransactionMask);
 }