From 5aaefcaef41a898511a92306a8f66a11c0cca1d0 Mon Sep 17 00:00:00 2001 From: Huahui Wu Date: Sun, 13 Mar 2011 18:10:25 -0700 Subject: b/3392594 keep the remaining touch points when one is ended. This is native side code for b/3392594, which takes the action index from java side, and set the touch point state accordingly. Change-Id: I894bcfc25f761725a5f37317a8fadffbba68b6df --- WebCore/platform/PlatformTouchEvent.h | 2 +- WebCore/platform/android/PlatformTouchEventAndroid.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'WebCore/platform') diff --git a/WebCore/platform/PlatformTouchEvent.h b/WebCore/platform/PlatformTouchEvent.h index e93c00e..9105887 100644 --- a/WebCore/platform/PlatformTouchEvent.h +++ b/WebCore/platform/PlatformTouchEvent.h @@ -67,7 +67,7 @@ public: PlatformTouchEvent(QTouchEvent*); #elif PLATFORM(ANDROID) // 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); + PlatformTouchEvent(const Vector&, const Vector&, TouchEventType, const Vector&, 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 957fc54..84af56d 100644 --- a/WebCore/platform/android/PlatformTouchEventAndroid.cpp +++ b/WebCore/platform/android/PlatformTouchEventAndroid.cpp @@ -38,14 +38,14 @@ enum AndroidMetaKeyState { }; // 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) +PlatformTouchEvent::PlatformTouchEvent(const Vector& ids, const Vector& windowPoints, TouchEventType type, const Vector& states, int metaState) : m_type(type) , m_metaKey(false) { m_touchPoints.reserveCapacity(windowPoints.size()); for (unsigned c = 0; c < windowPoints.size(); c++) // 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_touchPoints.append(PlatformTouchPoint(ids[c], windowPoints[c], states[c])); m_altKey = metaState & META_ALT_ON; m_shiftKey = metaState & META_SHIFT_ON; -- cgit v1.1