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

diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index e57fb59..25afeef 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -55,7 +55,7 @@
  * This also implements onFrameAvailable(), which notifies SurfaceFlinger
  * that new data has arrived.
  */
-class Layer : public LayerBaseClient,
+class Layer : public LayerBase,
               public SurfaceFlingerConsumer::FrameAvailableListener
 {
 public:
@@ -93,7 +93,7 @@
     virtual void setName(const String8& name);
     virtual bool isVisible() const;
 
-    // LayerBaseClient interface
+    // LayerBase interface
     virtual wp<IBinder> getSurfaceTextureBinder() const;
 
     // only for debugging