commit b79f61d41ef053bee1087ec612896c59f95f9686
author Mathias Agopian <mathias@google.com> Tue Mar 05 15:14:58 2013 -0800
committer Mathias Agopian <mathias@google.com> Tue Mar 05 19:52:30 2013 -0800
tree 93f82933f30e30e39baa7fc2c43581a4a12f8a3c
parent 089a15298e045598bf15fd2a46284c34dd56384c

fold LayerBaseClient into LayerBase

Change-Id: Ic745136522df59c42f0885fd969e75ea55d09f01

services/surfaceflinger/SurfaceFlinger.h

diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 0475835..1f63b42 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -61,7 +61,6 @@
 class IGraphicBufferAlloc;
 class Layer;
 class LayerBase;
-class LayerBaseClient;
 class LayerDim;
 class Surface;
 
@@ -130,7 +129,6 @@
     friend class Client;
     friend class DisplayEventConnection;
     friend class LayerBase;
-    friend class LayerBaseClient;
     friend class Layer;
 
     // We're reference counted, never destroy SurfaceFlinger directly
@@ -279,14 +277,14 @@
     // called when all clients have released all their references to
     // this layer meaning it is entirely safe to destroy all
     // resources associated to this layer.
-    status_t onLayerDestroyed(const wp<LayerBaseClient>& layer);
+    status_t onLayerDestroyed(const wp<LayerBase>& layer);
 
     // remove a layer from SurfaceFlinger immediately
     status_t removeLayer(const sp<LayerBase>& layer);
 
     // add a layer to SurfaceFlinger
     void addClientLayer(const sp<Client>& client, const sp<IBinder>& handle,
-        const sp<LayerBaseClient>& lbc);
+        const sp<LayerBase>& lbc);
 
     status_t removeLayer_l(const sp<LayerBase>& layer);
     status_t purgatorizeLayer_l(const sp<LayerBase>& layer);