diff options
| author | John Reck <jreck@google.com> | 2014-10-31 22:55:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-31 22:55:47 +0000 |
| commit | a8d83d639a5687b2ab5689db4ea61e2a6cce66f4 (patch) | |
| tree | e8441152d52d9388d9db09e039e3797cc2e38295 /libs/hwui/DeferredLayerUpdater.cpp | |
| parent | f34fa3e7aa9be9bf24c955a9ebf34022e4b88c25 (diff) | |
| parent | 0e89e2b7bcb2c035e8cee77f93120e7c5617f8d2 (diff) | |
| download | frameworks_base-a8d83d639a5687b2ab5689db4ea61e2a6cce66f4.zip frameworks_base-a8d83d639a5687b2ab5689db4ea61e2a6cce66f4.tar.gz frameworks_base-a8d83d639a5687b2ab5689db4ea61e2a6cce66f4.tar.bz2 | |
Merge "Layer changes" into lmp-mr1-dev
Diffstat (limited to 'libs/hwui/DeferredLayerUpdater.cpp')
| -rw-r--r-- | libs/hwui/DeferredLayerUpdater.cpp | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/libs/hwui/DeferredLayerUpdater.cpp b/libs/hwui/DeferredLayerUpdater.cpp index a6d7e78..d02455c 100644 --- a/libs/hwui/DeferredLayerUpdater.cpp +++ b/libs/hwui/DeferredLayerUpdater.cpp @@ -24,25 +24,6 @@ namespace android { namespace uirenderer { -class DeleteLayerTask : public renderthread::RenderTask { -public: - DeleteLayerTask(renderthread::EglManager& eglManager, Layer* layer) - : mEglManager(eglManager) - , mLayer(layer) - {} - - virtual void run() { - mEglManager.requireGlContext(); - LayerRenderer::destroyLayer(mLayer); - mLayer = 0; - delete this; - } - -private: - renderthread::EglManager& mEglManager; - Layer* mLayer; -}; - DeferredLayerUpdater::DeferredLayerUpdater(renderthread::RenderThread& thread, Layer* layer) : mSurfaceTexture(0) , mTransform(0) @@ -62,7 +43,7 @@ DeferredLayerUpdater::DeferredLayerUpdater(renderthread::RenderThread& thread, L DeferredLayerUpdater::~DeferredLayerUpdater() { SkSafeUnref(mColorFilter); setTransform(0); - mRenderThread.queue(new DeleteLayerTask(mRenderThread.eglManager(), mLayer)); + mLayer->postDecStrong(); mLayer = 0; } |