diff options
| author | Ben Murdoch <benm@google.com> | 2010-02-24 15:21:38 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-02-24 17:28:35 +0000 |
| commit | 4a20cc3dcfdb38c64737f41e6725c307a6284267 (patch) | |
| tree | 33ec810d917098123eb023ac2680abc74c274b7a /WebKit/android/jni | |
| parent | 0cc2a34217e9839e2c5428095b204a0014ba8f64 (diff) | |
| download | external_webkit-4a20cc3dcfdb38c64737f41e6725c307a6284267.zip external_webkit-4a20cc3dcfdb38c64737f41e6725c307a6284267.tar.gz external_webkit-4a20cc3dcfdb38c64737f41e6725c307a6284267.tar.bz2 | |
Do not forward touch event types we do not support into WebCore as TouchCancel events. The old behavior creates an issue now we support pinch to zoom where releasing the pinch will always send a touch cancel to WebCore as the Java land touch event type is ACTION_POINTER_UP.
Change-Id: Ie691f4a3c5ba6a09c3838deb37d8b9e0671c835b
Diffstat (limited to 'WebKit/android/jni')
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index 7130d8f..6164fd6 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1970,9 +1970,10 @@ int WebViewCore::handleTouchEvent(int action, int x, int y, long time, int metaS touchState = WebCore::PlatformTouchPoint::TouchPressed; break; default: - type = WebCore::TouchCancel; - touchState = WebCore::PlatformTouchPoint::TouchCancelled; - break; + // We do not support other kinds of touch event inside WebCore + // at the moment. + LOGW("Java passed a touch event type that we do not support in WebCore: %d", action); + return 0; } // Track previous touch and if stationary set the state. |