diff options
| author | Mathias Agopian <mathias@google.com> | 2011-06-13 14:15:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-13 14:15:00 -0700 |
| commit | c031afc8e9ad6c940c7d67a15b9c53092987377e (patch) | |
| tree | 71f384a3f6592d8acfa591db59bae6c26f9c8d50 /services | |
| parent | c793f521e5ace1dca39d65de3ed60d7c8242f661 (diff) | |
| parent | 77079399fca3e9c71e2ac06f3da26934e1c278b9 (diff) | |
| download | frameworks_base-c031afc8e9ad6c940c7d67a15b9c53092987377e.zip frameworks_base-c031afc8e9ad6c940c7d67a15b9c53092987377e.tar.gz frameworks_base-c031afc8e9ad6c940c7d67a15b9c53092987377e.tar.bz2 | |
am 77079399: am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '77079399fca3e9c71e2ac06f3da26934e1c278b9':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Diffstat (limited to 'services')
| -rw-r--r-- | services/surfaceflinger/Layer.cpp | 5 | ||||
| -rw-r--r-- | services/surfaceflinger/Layer.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 4bb256f..78ca3c6 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -61,6 +61,7 @@ Layer::Layer(SurfaceFlinger* flinger, mBufferManager(mTextureManager), mWidth(0), mHeight(0), mNeedsScaling(false), mFixedSize(false) { + setDestroyer(this); } Layer::~Layer() @@ -77,8 +78,8 @@ Layer::~Layer() } } -void Layer::destroy() const { - mFlinger->destroyLayer(this); +void Layer::destroy(RefBase const* base) { + mFlinger->destroyLayer(static_cast<LayerBase const*>(base)); } status_t Layer::setToken(const sp<UserClient>& userClient, diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h index 278d64e..5330c08 100644 --- a/services/surfaceflinger/Layer.h +++ b/services/surfaceflinger/Layer.h @@ -44,7 +44,7 @@ class UserClient; // --------------------------------------------------------------------------- -class Layer : public LayerBaseClient +class Layer : public LayerBaseClient, private RefBase::Destroyer { public: Layer(SurfaceFlinger* flinger, DisplayID display, @@ -92,7 +92,7 @@ public: return mFreezeLock; } protected: - virtual void destroy() const; + virtual void destroy(RefBase const* base); virtual void dump(String8& result, char* scratch, size_t size) const; private: |