diff options
| author | Chris Craik <ccraik@google.com> | 2014-11-26 20:50:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-26 20:50:10 +0000 |
| commit | ca84c8b1b0e364e01ce392f0dbca5132830a148d (patch) | |
| tree | 380eb2c186cf19a4b4c76f8de342c9b9c8182f90 /libs | |
| parent | a181da10ac5a7fc750d046e7789ba2244ee563b9 (diff) | |
| parent | 9f81485a76dd02a07fd460a29db6adddd2ca2efe (diff) | |
| download | frameworks_base-ca84c8b1b0e364e01ce392f0dbca5132830a148d.zip frameworks_base-ca84c8b1b0e364e01ce392f0dbca5132830a148d.tar.gz frameworks_base-ca84c8b1b0e364e01ce392f0dbca5132830a148d.tar.bz2 | |
Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index 4f39ac9..39528be 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -60,8 +60,6 @@ CanvasContext::~CanvasContext() { void CanvasContext::destroy() { stopDrawing(); - setSurface(NULL); - mEglManager.usePBufferSurface(); freePrefetechedLayers(); destroyHardwareResources(); mAnimationContext->destroy(); @@ -69,6 +67,7 @@ void CanvasContext::destroy() { delete mCanvas; mCanvas = 0; } + setSurface(NULL); } void CanvasContext::setSurface(ANativeWindow* window) { |