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/Client.h

diff --git a/services/surfaceflinger/Client.h b/services/surfaceflinger/Client.h
index e6a7165..43f8fb7 100644
--- a/services/surfaceflinger/Client.h
+++ b/services/surfaceflinger/Client.h
@@ -30,7 +30,7 @@
 
 // ---------------------------------------------------------------------------
 
-class LayerBaseClient;
+class LayerBase;
 class SurfaceFlinger;
 
 // ---------------------------------------------------------------------------
@@ -44,11 +44,11 @@
     status_t initCheck() const;
 
     // protected by SurfaceFlinger::mStateLock
-    void attachLayer(const sp<IBinder>& handle, const sp<LayerBaseClient>& layer);
+    void attachLayer(const sp<IBinder>& handle, const sp<LayerBase>& layer);
 
-    void detachLayer(const LayerBaseClient* layer);
+    void detachLayer(const LayerBase* layer);
 
-    sp<LayerBaseClient> getLayerUser(const sp<IBinder>& handle) const;
+    sp<LayerBase> getLayerUser(const sp<IBinder>& handle) const;
 
 private:
     // ISurfaceComposerClient interface
@@ -66,7 +66,7 @@
     sp<SurfaceFlinger> mFlinger;
 
     // protected by mLock
-    DefaultKeyedVector< wp<IBinder>, wp<LayerBaseClient> > mLayers;
+    DefaultKeyedVector< wp<IBinder>, wp<LayerBase> > mLayers;
 
     // thread-safe
     mutable Mutex mLock;