diff options
| author | Huahui Wu <hwu@google.com> | 2010-09-02 13:14:24 -0700 |
|---|---|---|
| committer | Huahui Wu <hwu@google.com> | 2010-09-27 10:20:08 -0700 |
| commit | 17a554651c9530d8c0e0a2c1e04b9b7c2f683bd6 (patch) | |
| tree | ae3cfeb14ac8bd6132165583c5088bae986b45d6 /WebCore/platform/android/PlatformTouchPointAndroid.cpp | |
| parent | c95d7f499ee3250e2d4a51f7e8f04bb6ebfc6add (diff) | |
| download | external_webkit-17a554651c9530d8c0e0a2c1e04b9b7c2f683bd6.zip external_webkit-17a554651c9530d8c0e0a2c1e04b9b7c2f683bd6.tar.gz external_webkit-17a554651c9530d8c0e0a2c1e04b9b7c2f683bd6.tar.bz2 | |
Bug: 2372180
This CL adds support to pass multi-touch event from browser to webkit.
PlatformTouchEvent.h and PlatformTouchEventAndroid.cpp:
changed the android constructor to take multiple touch points.
PlatformTouchPoint.h and PlatformTouchPointAndroid.cpp:
changed the android constructor to take a touch point ID.
WebViewCore.h and WebViewCore.cpp:
1. Updated handleTouchEvent(), HandleTouchEvent(), and jni interface
to take multiple points.
2. Added support of action
MotionEvent.ACTION_POINTER_DOWN & MotionEvent.ACTION_POINTER_UP.
Change-Id: I79cffdba12a60ced9a571b4c1fd5b520a0fb6074
Diffstat (limited to 'WebCore/platform/android/PlatformTouchPointAndroid.cpp')
| -rw-r--r-- | WebCore/platform/android/PlatformTouchPointAndroid.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/platform/android/PlatformTouchPointAndroid.cpp b/WebCore/platform/android/PlatformTouchPointAndroid.cpp index f134c0e..5a181cc 100644 --- a/WebCore/platform/android/PlatformTouchPointAndroid.cpp +++ b/WebCore/platform/android/PlatformTouchPointAndroid.cpp @@ -30,8 +30,9 @@ namespace WebCore { -PlatformTouchPoint::PlatformTouchPoint(const IntPoint& windowPos, State state) - : m_id(0) +// Changes in following two lines are in ANDROID but waiting for patch to WebKit getting accepted. +PlatformTouchPoint::PlatformTouchPoint(unsigned id, const IntPoint& windowPos, State state) + : m_id(id) , m_state(state) , m_screenPos(windowPos) , m_pos(windowPos) { } |