From 4ac825dd95a2c0a351748f85f8fcae2d7968c94d Mon Sep 17 00:00:00 2001 From: Huahui Wu Date: Thu, 13 Jan 2011 15:57:11 -0800 Subject: b/3133123 Pass touch point ids to WebKit This is the CL in WebKit side and it needs the framwork CL: https://android-git.corp.google.com/g/#change,89630 Notice some changes touch open source WebKit's code, so b/3351313 is filed to keep track of that. Change-Id: I0ac5d75c4a90f14afeb2e3fc2dc5b1c437c631f8 --- WebCore/platform/PlatformTouchEvent.h | 3 ++- WebCore/platform/android/PlatformTouchEventAndroid.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'WebCore') diff --git a/WebCore/platform/PlatformTouchEvent.h b/WebCore/platform/PlatformTouchEvent.h index 84ed910..e93c00e 100644 --- a/WebCore/platform/PlatformTouchEvent.h +++ b/WebCore/platform/PlatformTouchEvent.h @@ -66,7 +66,8 @@ public: #if PLATFORM(QT) PlatformTouchEvent(QTouchEvent*); #elif PLATFORM(ANDROID) - PlatformTouchEvent(const Vector&, TouchEventType, PlatformTouchPoint::State, int metaState); + // Changes in next line is in ANDROID but waiting to upstream to WebKit. TODO: upstream it. + PlatformTouchEvent(const Vector&, const Vector&, TouchEventType, PlatformTouchPoint::State, int metaState); #elif PLATFORM(BREWMP) PlatformTouchEvent(AEEEvent, uint16 wParam, uint32 dwParam); #endif diff --git a/WebCore/platform/android/PlatformTouchEventAndroid.cpp b/WebCore/platform/android/PlatformTouchEventAndroid.cpp index 8b3d285..957fc54 100644 --- a/WebCore/platform/android/PlatformTouchEventAndroid.cpp +++ b/WebCore/platform/android/PlatformTouchEventAndroid.cpp @@ -37,13 +37,15 @@ enum AndroidMetaKeyState { META_SYM_ON = 0x04 }; -PlatformTouchEvent::PlatformTouchEvent(const Vector& windowPoints, TouchEventType type, PlatformTouchPoint::State state, int metaState) +// Changes in next line is in ANDROID but waiting to upstream to WebKit. TODO: upstream it. +PlatformTouchEvent::PlatformTouchEvent(const Vector& ids, const Vector& windowPoints, TouchEventType type, PlatformTouchPoint::State state, int metaState) : m_type(type) , m_metaKey(false) { m_touchPoints.reserveCapacity(windowPoints.size()); for (unsigned c = 0; c < windowPoints.size(); c++) - m_touchPoints.append(PlatformTouchPoint(c, windowPoints[c], state)); + // Changes in next line is in ANDROID but waiting to upstream to WebKit. TODO: upstream it. + m_touchPoints.append(PlatformTouchPoint(ids[c], windowPoints[c], state)); m_altKey = metaState & META_ALT_ON; m_shiftKey = metaState & META_SHIFT_ON; -- cgit v1.1