diff options
| author | Huahui Wu <hwu@google.com> | 2011-03-14 14:42:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-14 14:42:05 -0700 |
| commit | 9bddcae7719c7fd62778a3cf1a63b1fdceb8e25a (patch) | |
| tree | 2282ed8b4dcf751bb78d05f12cc32f1936623b46 /WebCore/platform | |
| parent | df04d7a71c88ac5b84b3a3d06fdc8834eb1f2da2 (diff) | |
| parent | 5aaefcaef41a898511a92306a8f66a11c0cca1d0 (diff) | |
| download | external_webkit-9bddcae7719c7fd62778a3cf1a63b1fdceb8e25a.zip external_webkit-9bddcae7719c7fd62778a3cf1a63b1fdceb8e25a.tar.gz external_webkit-9bddcae7719c7fd62778a3cf1a63b1fdceb8e25a.tar.bz2 | |
Merge "b/3392594 keep the remaining touch points when one is ended." into honeycomb-mr1
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/PlatformTouchEvent.h | 2 | ||||
| -rw-r--r-- | WebCore/platform/android/PlatformTouchEventAndroid.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
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<int>&, const Vector<IntPoint>&, TouchEventType, PlatformTouchPoint::State, int metaState); + PlatformTouchEvent(const Vector<int>&, const Vector<IntPoint>&, TouchEventType, const Vector<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 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<int>& ids, const Vector<IntPoint>& windowPoints, TouchEventType type, PlatformTouchPoint::State state, int metaState) +PlatformTouchEvent::PlatformTouchEvent(const Vector<int>& ids, const Vector<IntPoint>& windowPoints, TouchEventType type, const Vector<PlatformTouchPoint::State>& 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; |