diff options
| author | Grace Kloba <klobag@google.com> | 2010-04-12 17:01:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-12 17:01:50 -0700 |
| commit | fef2cc629fa0738faf55c858bf9e436ecd911c5b (patch) | |
| tree | fbfb1c3ae8aafed5727b90424ca2ded079831168 /WebKit | |
| parent | 10dc1ad482db1a25cfcaee0b94494b721a48a74a (diff) | |
| parent | 46051e5e6a8f3aad61708da3af19bd4eb05509ac (diff) | |
| download | external_webkit-fef2cc629fa0738faf55c858bf9e436ecd911c5b.zip external_webkit-fef2cc629fa0738faf55c858bf9e436ecd911c5b.tar.gz external_webkit-fef2cc629fa0738faf55c858bf9e436ecd911c5b.tar.bz2 | |
am 46051e5e: am 164756aa: 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
Diffstat (limited to 'WebKit')
| -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; |