diff options
| author | Ben Murdoch <benm@google.com> | 2010-04-15 10:22:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-15 10:22:47 -0700 |
| commit | 40a329169016c529dd7ff6bf403a00f1307f9eb6 (patch) | |
| tree | 513295e942579cca6df859016a182794e342bf72 | |
| parent | 7f593939475f95ad30f95c6779b1787fff01c5e4 (diff) | |
| parent | ea23914212d72886e8be45e6aa4e7eed7e5fc2ba (diff) | |
| download | external_webkit-40a329169016c529dd7ff6bf403a00f1307f9eb6.zip external_webkit-40a329169016c529dd7ff6bf403a00f1307f9eb6.tar.gz external_webkit-40a329169016c529dd7ff6bf403a00f1307f9eb6.tar.bz2 | |
Merge "Remove the TouchStationary state from PlatformTouchPoint."
| -rw-r--r-- | WebCore/platform/PlatformTouchPoint.h | 1 | ||||
| -rw-r--r-- | WebCore/platform/qt/PlatformTouchPointQt.cpp | 1 | ||||
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 8 | ||||
| -rw-r--r-- | WebKit/android/jni/WebViewCore.h | 1 |
4 files changed, 0 insertions, 11 deletions
diff --git a/WebCore/platform/PlatformTouchPoint.h b/WebCore/platform/PlatformTouchPoint.h index d4f855e..90a3ace 100644 --- a/WebCore/platform/PlatformTouchPoint.h +++ b/WebCore/platform/PlatformTouchPoint.h @@ -40,7 +40,6 @@ public: TouchReleased, TouchPressed, TouchMoved, - TouchStationary, TouchCancelled }; diff --git a/WebCore/platform/qt/PlatformTouchPointQt.cpp b/WebCore/platform/qt/PlatformTouchPointQt.cpp index c293212..6afe4a1 100644 --- a/WebCore/platform/qt/PlatformTouchPointQt.cpp +++ b/WebCore/platform/qt/PlatformTouchPointQt.cpp @@ -35,7 +35,6 @@ PlatformTouchPoint::PlatformTouchPoint(const QTouchEvent::TouchPoint& point) case Qt::TouchPointReleased: m_state = TouchReleased; break; case Qt::TouchPointMoved: m_state = TouchMoved; break; case Qt::TouchPointPressed: m_state = TouchPressed; break; - case Qt::TouchPointStationary: m_state = TouchStationary; break; } m_screenPos = point.screenPos().toPoint(); m_pos = point.pos().toPoint(); 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 |