summaryrefslogtreecommitdiffstats
path: root/WebKit/android/jni/WebViewCore.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-04-14 17:40:16 -0700
committerBen Murdoch <benm@google.com>2010-04-14 17:40:16 -0700
commitea23914212d72886e8be45e6aa4e7eed7e5fc2ba (patch)
tree4ddb51fa4c27b642580b112c5687967c474f1442 /WebKit/android/jni/WebViewCore.cpp
parente6fa2a29f3eada7555d732e7fefc5c7b098805ac (diff)
downloadexternal_webkit-ea23914212d72886e8be45e6aa4e7eed7e5fc2ba.zip
external_webkit-ea23914212d72886e8be45e6aa4e7eed7e5fc2ba.tar.gz
external_webkit-ea23914212d72886e8be45e6aa4e7eed7e5fc2ba.tar.bz2
Remove the TouchStationary state from PlatformTouchPoint.
This is being tracked upstream at webkit.org in https://bugs.webkit.org/show_bug.cgi?id=37609 Change-Id: Ideb26d7457e27799564e8db9b3308a703a1110e2
Diffstat (limited to 'WebKit/android/jni/WebViewCore.cpp')
-rw-r--r--WebKit/android/jni/WebViewCore.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index eafd91c..5a0c471 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -2073,14 +2073,6 @@ 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);
-// 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;
-
WebCore::PlatformTouchEvent te(pt, type, touchState, metaState);
preventDefault = m_mainFrame->eventHandler()->handleTouchEvent(te);
#endif