commit 13127d8921356dff794250e04208c3ed60b3a3df
author Mathias Agopian <mathias@google.com> Tue Mar 05 17:47:11 2013 -0800
committer Mathias Agopian <mathias@google.com> Tue Mar 05 19:52:30 2013 -0800
tree b9026d22b58ef884d8bfb0f7eacf2bc3b08ffa17
parent 2f73af9212487c81d31d07227fa8a2f4abc77638

Get rid of LayerBase.

The functionality of LayerBase and Layer is folded
into Layer. There wasn't a need for this abstraction
anymore.

Change-Id: I66511c08cc3d89009ba4deabf47e26cd4cfeaefb

services/surfaceflinger/Client.h

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