Support resize in Android Viewer App

tools/viewer/sk_app/android/GLWindowContext_android.cpp

 
 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <GLES/gl.h> 
 
 #include "GLWindowContext_android.h"
 
-#include <android/native_window_jni.h>

[djsollen, 2016/06/09 18:34:21]

add this back since you can remove it from the header.

-
 namespace sk_app {
 
 // Most of the following 3 functions (GLWindowContext::Create, constructor, desctructor)
 // are copied from Unix/Win platform with unix/win changed to android
 
 // platform-dependent create
 GLWindowContext* GLWindowContext::Create(void* platformData, const DisplayParams& params) {
     GLWindowContext_android* ctx = new GLWindowContext_android(platformData, params);
     if (!ctx->isValid()) {
         delete ctx;
@@ skipping 11 matching lines @@
     // any config code here (particularly for msaa)?
 
     this->initializeContext(platformData, params);
 }
 
 GLWindowContext_android::~GLWindowContext_android() {
     this->destroyContext();
 }
 
 void GLWindowContext_android::onInitializeContext(void* platformData, const DisplayParams& params) {
-    ContextPlatformData_android* androidPlatformData = 
-            reinterpret_cast<ContextPlatformData_android*>(platformData);
+    if (platformData != nullptr) {
+        ContextPlatformData_android* androidPlatformData =
+                reinterpret_cast<ContextPlatformData_android*>(platformData);
+        fNativeWindow = androidPlatformData->fNativeWindow;
+    } else {
+        SkASSERT(fNativeWindow);
+    }
 
-    fWidth = ANativeWindow_getWidth(androidPlatformData->fNativeWindow);
-    fHeight = ANativeWindow_getHeight(androidPlatformData->fNativeWindow);
+
+    fWidth = ANativeWindow_getWidth(fNativeWindow);
+    fHeight = ANativeWindow_getHeight(fNativeWindow);
 
     fDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
 
     EGLint majorVersion;
     EGLint minorVersion;
     eglInitialize(fDisplay, &majorVersion, &minorVersion);
 
     SkAssertResult(eglBindAPI(EGL_OPENGL_ES_API));
 
     EGLint numConfigs = 0;
@@ skipping 13 matching lines @@
 
     static const EGLint kEGLContextAttribsForOpenGLES[] = {
         EGL_CONTEXT_CLIENT_VERSION, 2,
         EGL_NONE
     };
     fEGLContext = eglCreateContext(
             fDisplay, surfaceConfig, nullptr, kEGLContextAttribsForOpenGLES);
     SkASSERT(EGL_NO_CONTEXT != fEGLContext);
 
     fSurface = eglCreateWindowSurface(
-            fDisplay, surfaceConfig, androidPlatformData->fNativeWindow, nullptr);
+            fDisplay, surfaceConfig, fNativeWindow, nullptr);
     SkASSERT(EGL_NO_SURFACE != fSurface);
 
     SkAssertResult(eglMakeCurrent(fDisplay, fSurface, fSurface, fEGLContext));
     // GLWindowContext::initializeContext will call GrGLCreateNativeInterface so we
     // won't call it here.
 
     glClearStencil(0);
     glClearColor(0, 0, 0, 0);
     glStencilMask(0xffffffff);
     glClear(GL_STENCIL_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
@@ skipping 18 matching lines @@
     fSurface = EGL_NO_SURFACE;
 }
 
 void GLWindowContext_android::onSwapBuffers() {
     if (fDisplay && fEGLContext && fSurface) {
         eglSwapBuffers(fDisplay, fSurface);
     }
 }
 
 }