diff options
| author | Jamie Gennis <jgennis@google.com> | 2010-07-16 15:14:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-16 15:14:44 -0700 |
| commit | c8c79a654d4ae8e3a883854e19cc2df757f72d82 (patch) | |
| tree | c5efa0a0080a5b9860ac2cec6581593cad4ae2fe /include | |
| parent | 00ba884436dc8b222ad850c73c936d87bf4e84de (diff) | |
| parent | 5ee65f0d441ca558bc95b60c1468f2aadfeeddbd (diff) | |
| download | frameworks_base-c8c79a654d4ae8e3a883854e19cc2df757f72d82.zip frameworks_base-c8c79a654d4ae8e3a883854e19cc2df757f72d82.tar.gz frameworks_base-c8c79a654d4ae8e3a883854e19cc2df757f72d82.tar.bz2 | |
Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread
Diffstat (limited to 'include')
| -rw-r--r-- | include/surfaceflinger/Surface.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/surfaceflinger/Surface.h b/include/surfaceflinger/Surface.h index 4fd0681..294c867 100644 --- a/include/surfaceflinger/Surface.h +++ b/include/surfaceflinger/Surface.h @@ -20,6 +20,7 @@ #include <stdint.h> #include <sys/types.h> +#include <utils/KeyedVector.h> #include <utils/RefBase.h> #include <utils/threads.h> @@ -147,8 +148,7 @@ public: static status_t writeToParcel( const sp<Surface>& control, Parcel* parcel); - static sp<Surface> readFromParcel( - const Parcel& data, const sp<Surface>& other); + static sp<Surface> readFromParcel(const Parcel& data); static bool isValid(const sp<Surface>& surface) { return (surface != 0) && surface->isValid(); @@ -244,6 +244,8 @@ private: uint32_t *pWidth, uint32_t *pHeight, uint32_t *pFormat, uint32_t *pUsage) const; + static void cleanCachedSurfaces(); + class BufferInfo { uint32_t mWidth; uint32_t mHeight; @@ -298,6 +300,10 @@ private: // Inherently thread-safe mutable Mutex mSurfaceLock; mutable Mutex mApiLock; + + // A cache of Surface objects that have been deserialized into this process. + static Mutex sCachedSurfacesLock; + static DefaultKeyedVector<wp<IBinder>, wp<Surface> > sCachedSurfaces; }; }; // namespace android |