Fix visualbench exiting on startup on android

platform_tools/android/apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkOSWindow_Android.h"
 
 #include <GLES/gl.h>
 
 SkOSWindow::SkOSWindow(void* hwnd) {
     fWindow.fDisplay = EGL_NO_DISPLAY;
     fWindow.fContext = EGL_NO_CONTEXT;
     fWindow.fSurface = EGL_NO_SURFACE;
     fNativeWindow = (ANativeWindow*)hwnd;
     fDestroyRequested = false;
 }
 
 SkOSWindow::~SkOSWindow() {
-    if (fWindow.fDisplay != EGL_NO_DISPLAY) {
-        eglMakeCurrent(fWindow.fDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-        if (fWindow.fContext != EGL_NO_CONTEXT) {
-            eglDestroyContext(fWindow.fDisplay, fWindow.fContext);
-        }
-        if (fWindow.fSurface != EGL_NO_SURFACE) {
-            eglDestroySurface(fWindow.fDisplay, fWindow.fSurface);
-        }
-        eglTerminate(fWindow.fDisplay);
-    }
-    fWindow.fDisplay = EGL_NO_DISPLAY;
-    fWindow.fContext = EGL_NO_CONTEXT;
-    fWindow.fSurface = EGL_NO_SURFACE;
+    this->detach();
 }
 
 bool SkOSWindow::attach(SkBackEndTypes attachType,
                         int /*msaaSampleCount*/,
                         AttachmentInfo* info) {
     static const EGLint kEGLContextAttribsForOpenGL[] = {
         EGL_NONE
     };
 
     static const EGLint kEGLContextAttribsForOpenGLES[] = {
@@ skipping 96 matching lines @@
 
         // We retrieve the fullscreen width and height
         this->setSize((SkScalar)w, (SkScalar)h);
         return true;
     } else {
         return false;
     }
 }
 
 void SkOSWindow::detach() {
-    fDestroyRequested = true;
+    if (fWindow.fDisplay != EGL_NO_DISPLAY) {
+        eglMakeCurrent(fWindow.fDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+        if (fWindow.fContext != EGL_NO_CONTEXT) {
+            eglDestroyContext(fWindow.fDisplay, fWindow.fContext);
+        }
+        if (fWindow.fSurface != EGL_NO_SURFACE) {
+            eglDestroySurface(fWindow.fDisplay, fWindow.fSurface);
+        }
+        eglTerminate(fWindow.fDisplay);
+    }
+    fWindow.fDisplay = EGL_NO_DISPLAY;
+    fWindow.fContext = EGL_NO_CONTEXT;
+    fWindow.fSurface = EGL_NO_SURFACE;
 }
 
 void SkOSWindow::present() {
     if (fWindow.fDisplay != EGL_NO_DISPLAY && fWindow.fContext != EGL_NO_CONTEXT) {
         eglSwapBuffers(fWindow.fDisplay, fWindow.fSurface);
     }
 }
 
 void SkOSWindow::closeWindow() {
     fDestroyRequested = true;
@@ skipping 17 matching lines @@
 
 ///////////////////////////////////////////
 /////////////// SkEvent impl //////////////
 ///////////////////////////////////////////
 
 void SkEvent::SignalQueueTimer(SkMSec ms) {
 }
 
 void SkEvent::SignalNonEmptyQueue() {
 }