diff options
| author | Grace Kloba <klobag@google.com> | 2010-04-12 11:13:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-12 11:13:36 -0700 |
| commit | 164756aae729daa66d9e87c1c930be7568054912 (patch) | |
| tree | fbd3528ed216dee7d77721401491787408517724 | |
| parent | 411a8ae3907d3288c7e8ed008d61303f08fe265a (diff) | |
| parent | 32f6fde6a147df3feef9920fc736cc54afc99f5c (diff) | |
| download | external_webkit-164756aae729daa66d9e87c1c930be7568054912.zip external_webkit-164756aae729daa66d9e87c1c930be7568054912.tar.gz external_webkit-164756aae729daa66d9e87c1c930be7568054912.tar.bz2 | |
Merge "Do not set touch state to TouchStationary as EventHandler doesn't handle it. The result is preventDefault will be always false and trigger the unexpected behavior for Flash." into froyo
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index 9c64566..eafd91c 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -2073,8 +2073,11 @@ bool WebViewCore::handleTouchEvent(int action, int x, int y, int metaState) // Track previous touch and if stationary set the state. WebCore::IntPoint pt(x - m_scrollOffsetX, y - m_scrollOffsetY); - if (type == WebCore::TouchMove && pt == m_lastTouchPoint) - touchState = WebCore::PlatformTouchPoint::TouchStationary; +// handleTouchEvent() in EventHandler.cpp doesn't handle TouchStationary, which +// causes preventDefault be false when it returns. As our Java side may continue +// process the events if WebKit doesn't, it can cause unexpected result. +// if (type == WebCore::TouchMove && pt == m_lastTouchPoint) +// touchState = WebCore::PlatformTouchPoint::TouchStationary; m_lastTouchPoint = pt; |