Index: tools/viewer/sk_app/android/Window_android.h |
diff --git a/tools/viewer/sk_app/android/Window_android.h b/tools/viewer/sk_app/android/Window_android.h |
index d41f0a54c2a6f2c1c2bf42663107acc2a47cb7bd..a3104516197a0ca42b7e5456bc09a291abdc1789 100644 |
--- a/tools/viewer/sk_app/android/Window_android.h |
+++ b/tools/viewer/sk_app/android/Window_android.h |
@@ -8,8 +8,9 @@ |
#ifndef Window_android_DEFINED |
#define Window_android_DEFINED |
-#include "../Window.h" |
#include <android_native_app_glue.h> |
djsollen
2016/05/06 18:45:26
remove this and all references to android_app*
liyuqian
2016/05/06 20:42:30
Done.
|
+#include "../Window.h" |
+#include "surface_glue_android.h" |
namespace sk_app { |
@@ -26,12 +27,13 @@ public: |
~Window_android() override {} |
bool init(android_app* app_state); |
+ bool init(AppThread* appThread); |
void initDisplay(ANativeWindow* window); |
void setTitle(const char*) override; |
void show() override {} |
- bool attach(BackEndType attachType, int msaaSampleCount, bool deepColor) override; |
+ bool attach(BackEndType attachType, int msaaSampleCount) override; |
void inval() override; |
void paintIfNeeded(); |
@@ -43,8 +45,10 @@ public: |
private: |
android_app* mApp = nullptr; |
+ AppThread* mAppThread = nullptr; |
SkRect mContentRect; |
int mSampleCount = 0; |
+ bool nativeWindowInitialized = false; |
jvanverth1
2016/05/06 17:02:07
We start member variables with 'f', so this should
liyuqian
2016/05/06 20:42:30
Done.
|
}; |
} // namespace sk_app |