Chromium Code Reviews| Index: tools/viewer/sk_app/android/GLWindowContext_android.h |
| diff --git a/tools/viewer/sk_app/android/GLWindowContext_android.h b/tools/viewer/sk_app/android/GLWindowContext_android.h |
| index 85e65beaa251b451cb41ab3d98d0cc33f178496c..fbfa19da8812ad313515cbb08beba7bd0feb32f0 100644 |
| --- a/tools/viewer/sk_app/android/GLWindowContext_android.h |
| +++ b/tools/viewer/sk_app/android/GLWindowContext_android.h |
| @@ -8,6 +8,8 @@ |
| #ifndef GLWindowContext_android_DEFINED |
| #define GLWindowContext_android_DEFINED |
| +#include <android/native_window_jni.h> |
|
djsollen
2016/06/09 18:34:21
don't need this here. Just before the namespace l
|
| + |
| #include "../GLWindowContext.h" |
| #include "Window_android.h" |
| @@ -32,6 +34,9 @@ private: |
| EGLDisplay fDisplay; |
| EGLContext fEGLContext; |
| EGLSurface fSurface; |
| + |
| + // For setDisplayParams and resize which call onInitializeContext with null platformData |
| + ANativeWindow* fNativeWindow = nullptr; |
| }; |