am 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface"

* commit '6afc5cf3d9e1a0c0eb6ecd6eea258f1ccd37bef3':
  Prevent calling GL functions with an invalid surface
This commit is contained in:
John Reck
2014-12-01 21:35:40 +00:00
committed by Android Git Automerger

View File

@@ -59,6 +59,7 @@ CanvasContext::~CanvasContext() {
void CanvasContext::destroy() { void CanvasContext::destroy() {
stopDrawing(); stopDrawing();
setSurface(NULL);
freePrefetechedLayers(); freePrefetechedLayers();
destroyHardwareResources(); destroyHardwareResources();
mAnimationContext->destroy(); mAnimationContext->destroy();
@@ -66,7 +67,6 @@ void CanvasContext::destroy() {
delete mCanvas; delete mCanvas;
mCanvas = 0; mCanvas = 0;
} }
setSurface(NULL);
} }
void CanvasContext::setSurface(ANativeWindow* window) { void CanvasContext::setSurface(ANativeWindow* window) {