AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix touch event parameter order

Browse Source 
The issue is so obvious... However, all newer Android devices (e.g.,
Nexus 6P, 5X, 9) are immune to this bug. So I didn't notice this until I
tested Viewer app on Nexus 7 yesterday...

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2254223002

Review-Url: https://codereview.chromium.org/2254223002
This commit is contained in:
liyuqian 2016-08-22 11:31:09 -07:00 committed by Commit bot
parent 7b145120f2
commit 23d24587ee
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/viewer/sk_app/android/surface_glue_android.cpp
View File

@ -147,9 +147,12 @@ int SkiaAndroidApp::message_callback(int fd, int events, void* data) {
} }
case kTouched: { case kTouched: {
auto it = ANDROID_TO_WINDOW_STATEMAP.find(message.fTouchState); auto it = ANDROID_TO_WINDOW_STATEMAP.find(message.fTouchState);
SkASSERT(it != ANDROID_TO_WINDOW_STATEMAP.end()); if (it != ANDROID_TO_WINDOW_STATEMAP.end()) {
skiaAndroidApp->fWindow->onTouch(message.fTouchOwner, it->second, message.fTouchX, skiaAndroidApp->fWindow->onTouch(message.fTouchOwner, it->second, message.fTouchX,
message.fTouchY); message.fTouchY);
} else {
SkDebugf("Unknown Touch State: %d\n", message.fTouchState);
}
break; break;
} }
case kUIStateChanged: { case kUIStateChanged: {
@ -242,7 +245,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_skia_viewer_ViewerActivity_onKeyPress
} }
extern "C" JNIEXPORT void JNICALL Java_org_skia_viewer_ViewerActivity_onTouched( extern "C" JNIEXPORT void JNICALL Java_org_skia_viewer_ViewerActivity_onTouched(
JNIEnv* env, jobject activity, jlong handle, jint owner, jfloat x, jfloat y, jint state) { JNIEnv* env, jobject activity, jlong handle, jint owner, jint state, jfloat x, jfloat y) {
auto skiaAndroidApp = (SkiaAndroidApp*)handle; auto skiaAndroidApp = (SkiaAndroidApp*)handle;
Message message(kTouched); Message message(kTouched);
message.fTouchOwner = owner; message.fTouchOwner = owner;