am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev

* commit '4e3404d90fe33a0ff790aff4a97b6bb55e4c0e8f':
  Force-use the pbuffer surface for destroy
This commit is contained in:
John Reck
2014-11-26 12:02:19 +00:00
committed by Android Git Automerger

View File

@@ -60,6 +60,8 @@ CanvasContext::~CanvasContext() {
void CanvasContext::destroy() { void CanvasContext::destroy() {
stopDrawing(); stopDrawing();
setSurface(NULL);
mEglManager.usePBufferSurface();
freePrefetechedLayers(); freePrefetechedLayers();
destroyHardwareResources(); destroyHardwareResources();
mAnimationContext->destroy(); mAnimationContext->destroy();
@@ -67,7 +69,6 @@ void CanvasContext::destroy() {
delete mCanvas; delete mCanvas;
mCanvas = 0; mCanvas = 0;
} }
setSurface(NULL);
} }
void CanvasContext::setSurface(ANativeWindow* window) { void CanvasContext::setSurface(ANativeWindow* window) {