commit c75c44d3e7237facad8b29696260cafaa8b85763
author Chia-I Wu <olv@google.com> Mon Nov 27 14:32:57 2017 -0800
committer Chia-I Wu <olv@google.com> Mon Dec 11 11:11:27 2017 -0800
tree 1ddefe8d0c19419cf19e6c5103a17f0042dbea1b
parent e1e1187a39ea6fdb752c09f812023b875df01366

surfaceflinger: move SurfaceFlingerConsumer::mLayer

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

Test: boots
Change-Id: I835ec0990b5bbdbd2b61444b6fbad700e0cb8c14

services/surfaceflinger/SurfaceFlingerConsumer.h

diff --git a/services/surfaceflinger/SurfaceFlingerConsumer.h b/services/surfaceflinger/SurfaceFlingerConsumer.h
index 1453e35..9eb5351 100644
--- a/services/surfaceflinger/SurfaceFlingerConsumer.h
+++ b/services/surfaceflinger/SurfaceFlingerConsumer.h
@@ -40,8 +40,8 @@
 
     SurfaceFlingerConsumer(const sp<IGraphicBufferConsumer>& consumer,
             uint32_t tex, Layer* layer)
-        : BufferLayerConsumer(consumer, tex),
-          mTransformToDisplayInverse(false), mSurfaceDamage(), mLayer(layer)
+        : BufferLayerConsumer(consumer, tex, layer),
+          mTransformToDisplayInverse(false), mSurfaceDamage()
     {}
 
     class BufferRejecter {
@@ -82,11 +82,6 @@
     virtual void setReleaseFence(const sp<Fence>& fence) override;
     bool releasePendingBuffer();
 
-    void onDisconnect() override;
-    void addAndGetFrameTimestamps(
-            const NewFrameEventsEntry* newTimestamps,
-            FrameEventHistoryDelta* outDelta) override;
-
 private:
     virtual void onSidebandStreamChanged();
 
@@ -103,9 +98,6 @@
     // A release that is pending on the receipt of a new release fence from
     // presentDisplay
     PendingRelease mPendingRelease;
-
-    // The layer for this SurfaceFlingerConsumer
-    const wp<Layer> mLayer;
 };
 
 // ----------------------------------------------------------------------------