From ea23914212d72886e8be45e6aa4e7eed7e5fc2ba Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 14 Apr 2010 17:40:16 -0700 Subject: 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 --- WebKit/android/jni/WebViewCore.cpp | 8 -------- WebKit/android/jni/WebViewCore.h | 1 - 2 files changed, 9 deletions(-) (limited to 'WebKit/android') 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 diff --git a/WebKit/android/jni/WebViewCore.h b/WebKit/android/jni/WebViewCore.h index 8c885e6..4a4b335 100644 --- a/WebKit/android/jni/WebViewCore.h +++ b/WebKit/android/jni/WebViewCore.h @@ -553,7 +553,6 @@ namespace android { #if ENABLE(TOUCH_EVENTS) bool m_forwardingTouchEvents; - IntPoint m_lastTouchPoint; #endif #if DEBUG_NAV_UI -- cgit v1.1