diff options
author | Mathias Agopian <mathias@google.com> | 2010-05-25 17:51:34 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2010-05-25 17:51:34 -0700 |
commit | 631f358d348ea5e7813ca01f86fc9f2a6536add6 (patch) | |
tree | c1745c4edb54837854c8697f3421698fcb9315ad /include/surfaceflinger/SurfaceComposerClient.h | |
parent | 97e8ff0b4bcfa9cc9205b2881a110a1c498c5deb (diff) | |
download | frameworks_native-631f358d348ea5e7813ca01f86fc9f2a6536add6.zip frameworks_native-631f358d348ea5e7813ca01f86fc9f2a6536add6.tar.gz frameworks_native-631f358d348ea5e7813ca01f86fc9f2a6536add6.tar.bz2 |
fix [2712278] The preview buffer left some black borders in left and bottom edges
we were incorrectly flagging push_buffer surfaces as invalid
Change-Id: I4dfd4ffbbe8a71f7e23e835db8d71966416c29bb
Diffstat (limited to 'include/surfaceflinger/SurfaceComposerClient.h')
-rw-r--r-- | include/surfaceflinger/SurfaceComposerClient.h | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/include/surfaceflinger/SurfaceComposerClient.h b/include/surfaceflinger/SurfaceComposerClient.h index 9d0f0cb..8396038 100644 --- a/include/surfaceflinger/SurfaceComposerClient.h +++ b/include/surfaceflinger/SurfaceComposerClient.h @@ -123,13 +123,6 @@ public: status_t linkToComposerDeath(const sp<IBinder::DeathRecipient>& recipient, void* cookie = NULL, uint32_t flags = 0); -private: - friend class Surface; - friend class SurfaceControl; - - SurfaceComposerClient(const sp<ISurfaceComposer>& sm, - const sp<IBinder>& conn); - status_t hide(SurfaceID id); status_t show(SurfaceID id, int32_t layer = -1); status_t freeze(SurfaceID id); @@ -142,17 +135,21 @@ private: status_t setMatrix(SurfaceID id, float dsdx, float dtdx, float dsdy, float dtdy); status_t setPosition(SurfaceID id, int32_t x, int32_t y); status_t setSize(SurfaceID id, uint32_t w, uint32_t h); - void signalServer(); - status_t destroySurface(SurfaceID sid); - void _init(const sp<ISurfaceComposer>& sm, + SharedClient* getSharedClient() const; + +private: + SurfaceComposerClient(const sp<ISurfaceComposer>& sm, + const sp<IBinder>& conn); + + void init(const sp<ISurfaceComposer>& sm, const sp<ISurfaceFlingerClient>& conn); - inline layer_state_t* _get_state_l(SurfaceID id); - layer_state_t* _lockLayerState(SurfaceID id); - inline void _unlockLayerState(); + inline layer_state_t* get_state_l(SurfaceID id); + layer_state_t* lockLayerState(SurfaceID id); + inline void unlockLayerState(); mutable Mutex mLock; layer_state_t* mPrebuiltLayerState; |