diff options
author | Mathias Agopian <mathias@google.com> | 2013-02-11 16:40:36 -0800 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2013-02-13 15:27:08 -0800 |
commit | ac9fa427d4a86745e60a5f7fd8e3ea340c4db907 (patch) | |
tree | 657e6ec979339bc0e291247310af356e6a19ef7e /services/surfaceflinger/Client.h | |
parent | b997f6ef0f3fa7cf67fd7487b88e5d6ac0bb15e9 (diff) | |
download | frameworks_native-ac9fa427d4a86745e60a5f7fd8e3ea340c4db907.zip frameworks_native-ac9fa427d4a86745e60a5f7fd8e3ea340c4db907.tar.gz frameworks_native-ac9fa427d4a86745e60a5f7fd8e3ea340c4db907.tar.bz2 |
get rid of Surface identity and token
we use the IBinder instead.
Change-Id: I4aa0b58869ba43f19980013620051e5a261b062d
Diffstat (limited to 'services/surfaceflinger/Client.h')
-rw-r--r-- | services/surfaceflinger/Client.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/services/surfaceflinger/Client.h b/services/surfaceflinger/Client.h index d6c6931..e6a7165 100644 --- a/services/surfaceflinger/Client.h +++ b/services/surfaceflinger/Client.h @@ -44,20 +44,20 @@ public: status_t initCheck() const; // protected by SurfaceFlinger::mStateLock - size_t attachLayer(const sp<LayerBaseClient>& layer); + void attachLayer(const sp<IBinder>& handle, const sp<LayerBaseClient>& layer); void detachLayer(const LayerBaseClient* layer); - sp<LayerBaseClient> getLayerUser(int32_t i) const; + sp<LayerBaseClient> getLayerUser(const sp<IBinder>& handle) const; private: // ISurfaceComposerClient interface virtual sp<ISurface> createSurface( - surface_data_t* params, const String8& name, + const String8& name, uint32_t w, uint32_t h,PixelFormat format, uint32_t flags); - virtual status_t destroySurface(SurfaceID surfaceId); + virtual status_t destroySurface(const sp<IBinder>& handle); virtual status_t onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags); @@ -66,8 +66,7 @@ private: sp<SurfaceFlinger> mFlinger; // protected by mLock - DefaultKeyedVector< size_t, wp<LayerBaseClient> > mLayers; - size_t mNameGenerator; + DefaultKeyedVector< wp<IBinder>, wp<LayerBaseClient> > mLayers; // thread-safe mutable Mutex mLock; |