Cleanup VulkanWindowContext for use on Android
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2058763002
Review-Url: https://codereview.chromium.org/2058763002
diff --git a/tools/viewer/Viewer.h b/tools/viewer/Viewer.h
index 3a4164d..af3b6ce 100644
--- a/tools/viewer/Viewer.h
+++ b/tools/viewer/Viewer.h
@@ -13,6 +13,7 @@
#include "sk_app/Window.h"
#include "gm.h"
#include "SkAnimTimer.h"
+#include "SkTouchGesture.h"
#include "Slide.h"
class SkCanvas;
diff --git a/tools/viewer/sk_app/VulkanWindowContext.h b/tools/viewer/sk_app/VulkanWindowContext.h
index 5071401..63b52bc 100644
--- a/tools/viewer/sk_app/VulkanWindowContext.h
+++ b/tools/viewer/sk_app/VulkanWindowContext.h
@@ -8,6 +8,8 @@
#ifndef VulkanWindowContext_DEFINED
#define VulkanWindowContext_DEFINED
+#include "SkTypes.h" // required to pull in any SkUserConfig defines
+
#ifdef SK_VULKAN
#include "vk/GrVkBackendContext.h"
diff --git a/tools/viewer/sk_app/android/VulkanWindowContext_android.cpp b/tools/viewer/sk_app/android/VulkanWindowContext_android.cpp
index 5c6b741..15dc0b0 100644
--- a/tools/viewer/sk_app/android/VulkanWindowContext_android.cpp
+++ b/tools/viewer/sk_app/android/VulkanWindowContext_android.cpp
@@ -6,8 +6,8 @@
* found in the LICENSE file.
*/
-#include "Window_android.h"
#include "../VulkanWindowContext.h"
+#include "WindowContext_android.h"
#include "vk/GrVkInterface.h"
#include "vk/GrVkUtil.h"
diff --git a/tools/viewer/sk_app/android/WindowContext_android.h b/tools/viewer/sk_app/android/WindowContext_android.h
new file mode 100644
index 0000000..f0529fe
--- /dev/null
+++ b/tools/viewer/sk_app/android/WindowContext_android.h
@@ -0,0 +1,21 @@
+/*
+* Copyright 2016 Google Inc.
+*
+* Use of this source code is governed by a BSD-style license that can be
+* found in the LICENSE file.
+*/
+
+#ifndef WindowContext_android_DEFINED
+#define WindowContext_android_DEFINED
+
+#include <android/native_window_jni.h>
+
+namespace sk_app {
+
+struct ContextPlatformData_android {
+ ANativeWindow* fNativeWindow;
+};
+
+} // namespace sk_app
+
+#endif // WindowContext_android_DEFINED
diff --git a/tools/viewer/sk_app/android/Window_android.h b/tools/viewer/sk_app/android/Window_android.h
index 10c35d0..f61ad6f 100644
--- a/tools/viewer/sk_app/android/Window_android.h
+++ b/tools/viewer/sk_app/android/Window_android.h
@@ -8,17 +8,12 @@
#ifndef Window_android_DEFINED
#define Window_android_DEFINED
-#include <android/native_window_jni.h>
-
#include "../Window.h"
+#include "WindowContext_android.h"
#include "surface_glue_android.h"
namespace sk_app {
-struct ContextPlatformData_android {
- ANativeWindow* fNativeWindow;
-};
-
class Window_android : public Window {
public:
Window_android() : Window() {}