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

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

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.cpp
diff --git a/tools/viewer/sk_app/android/Window_android.cpp b/tools/viewer/sk_app/android/Window_android.cpp
index 94be02c9336acc1493834c06918dad40ada2bfa7..b565375ac14ef4c5f4dd4e36bd0e751fd3f87b76 100644
--- a/tools/viewer/sk_app/android/Window_android.cpp
+++ b/tools/viewer/sk_app/android/Window_android.cpp
@@ -13,7 +13,7 @@ namespace sk_app {
Window* Window::CreateNativeWindow(void* platformData) {
Window_android* window = new Window_android();
- if (!window->init((android_app*)platformData)) {
+ if (!window->init((AppThread*)platformData)) {
delete window;
return nullptr;
}
@@ -23,6 +23,13 @@ Window* Window::CreateNativeWindow(void* platformData) {
static void handle_cmd(struct android_app* app, int32_t cmd);
static int32_t handle_input(struct android_app* app, AInputEvent* event);
+bool Window_android::init(AppThread* appThread) {
+ SkASSERT(appThread);
+ mAppThread = appThread;
+ mAppThread->window = this;
+ return true;
+}
+
bool Window_android::init(android_app* app) {
SkASSERT(app);
mApp = app;
@@ -54,6 +61,7 @@ void Window_android::initDisplay(ANativeWindow* window) {
ContextPlatformData_android platformData;
platformData.fNativeWindow = window;
fWindowContext = VulkanWindowContext::Create((void*)&platformData, mSampleCount);
+ nativeWindowInitialized = true;
}
static void android_app_write_cmd(struct android_app* android_app, int8_t cmd) {
@@ -63,11 +71,15 @@ static void android_app_write_cmd(struct android_app* android_app, int8_t cmd) {
}
void Window_android::inval() {
- android_app_write_cmd(mApp, APP_CMD_INVAL_WINDOW);
+ if (mApp) {
+ android_app_write_cmd(mApp, APP_CMD_INVAL_WINDOW);
+ } else {
+ paintIfNeeded();
+ }
}
void Window_android::paintIfNeeded() {
- if (mApp->window || !mContentRect.isEmpty()) {
+ if ((mApp && (mApp->window || !mContentRect.isEmpty())) || nativeWindowInitialized) {
this->onPaint();
}
}

Powered by Google App Engine
This is Rietveld 408576698