commit 67dcc69b8488a6802005438216120884e01bea84
author Chia-I Wu <olv@google.com> Mon Nov 27 14:51:06 2017 -0800
committer Chia-I Wu <olv@google.com> Mon Dec 11 11:11:27 2017 -0800
tree 389fe489125c22906a77497ec413a02ce7e5afd8
parent da5c730799cb60dfb9d64f31a5f59dc892fe0ce0

surfaceflinger: move all SurfaceFlingerConsumer data members

Move them and related methods to the base class,
BufferLayerConsumer.

This also moves the latching of mTransformToDisplayInverse and
mSurfaceDamage from acquireBufferLocked to updateAndReleaseLocked,
where LayerRejecter might reject the buffer and return early.

Test: boots
Change-Id: Ib76e8f42a9f9dbe807ba8b335746de561dd98851

services/surfaceflinger/BufferLayerConsumer.cpp

diff --git a/services/surfaceflinger/BufferLayerConsumer.cpp b/services/surfaceflinger/BufferLayerConsumer.cpp
index 110b7de..3ebc959 100644
--- a/services/surfaceflinger/BufferLayerConsumer.cpp
+++ b/services/surfaceflinger/BufferLayerConsumer.cpp
@@ -118,6 +118,8 @@
         mCurrentTimestamp(0),
         mCurrentDataSpace(HAL_DATASPACE_UNKNOWN),
         mCurrentFrameNumber(0),
+        mCurrentTransformToDisplayInverse(false),
+        mCurrentSurfaceDamage(),
         mDefaultWidth(1),
         mDefaultHeight(1),
         mFilteringEnabled(true),
@@ -397,6 +399,8 @@
     mCurrentFence = item.mFence;
     mCurrentFenceTime = item.mFenceTime;
     mCurrentFrameNumber = item.mFrameNumber;
+    mCurrentTransformToDisplayInverse = item.mTransformToDisplayInverse;
+    mCurrentSurfaceDamage = item.mSurfaceDamage;
 
     computeCurrentTransformMatrixLocked();
 
@@ -547,6 +551,15 @@
     return mCurrentFrameNumber;
 }
 
+bool BufferLayerConsumer::getTransformToDisplayInverse() const {
+    Mutex::Autolock lock(mMutex);
+    return mCurrentTransformToDisplayInverse;
+}
+
+const Region& BufferLayerConsumer::getSurfaceDamage() const {
+    return mCurrentSurfaceDamage;
+}
+
 sp<GraphicBuffer> BufferLayerConsumer::getCurrentBuffer(int* outSlot) const {
     Mutex::Autolock lock(mMutex);