summaryrefslogtreecommitdiffstats
path: root/WebKit/android/jni
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2010-04-09 14:44:39 -0700
committerGrace Kloba <klobag@google.com>2010-04-09 14:44:39 -0700
commit32f6fde6a147df3feef9920fc736cc54afc99f5c (patch)
treea98752ea254842c373c8fdf40ebee7bfbcea581a /WebKit/android/jni
parent18f501d6904704ce0eff4bfdc68f2ca4aeb66af9 (diff)
downloadexternal_webkit-32f6fde6a147df3feef9920fc736cc54afc99f5c.zip
external_webkit-32f6fde6a147df3feef9920fc736cc54afc99f5c.tar.gz
external_webkit-32f6fde6a147df3feef9920fc736cc54afc99f5c.tar.bz2
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. Fix http://b/issue?id=2585109
Diffstat (limited to 'WebKit/android/jni')
-rw-r--r--WebKit/android/jni/WebViewCore.cpp7
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;