Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev

This commit is contained in:
John Reck
2014-11-25 19:52:52 +00:00
committed by Android (Google) Code Review

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) {