Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(905)

Unified Diff: tools/viewer/sk_app/android/Window_android.h

Issue 1952323004: Initial commit of our new Android app to demo Skia. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Style Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698