diff options
| author | Huahui Wu <hwu@google.com> | 2011-01-13 15:57:11 -0800 |
|---|---|---|
| committer | Huahui Wu <hwu@google.com> | 2011-01-13 16:43:58 -0800 |
| commit | 4ac825dd95a2c0a351748f85f8fcae2d7968c94d (patch) | |
| tree | 63996d2d1f80a3bc937d5808c874093d4d7b3342 /WebCore/platform/android/PlatformTouchEventAndroid.cpp | |
| parent | 36d976165f994e4071601d8824987f25a0a8da07 (diff) | |
| download | external_webkit-4ac825dd95a2c0a351748f85f8fcae2d7968c94d.zip external_webkit-4ac825dd95a2c0a351748f85f8fcae2d7968c94d.tar.gz external_webkit-4ac825dd95a2c0a351748f85f8fcae2d7968c94d.tar.bz2 | |
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
Diffstat (limited to 'WebCore/platform/android/PlatformTouchEventAndroid.cpp')
| -rw-r--r-- | WebCore/platform/android/PlatformTouchEventAndroid.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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<IntPoint>& 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<int>& ids, const Vector<IntPoint>& 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; |