diff options
| author | Steve Block <steveblock@google.com> | 2011-06-07 18:11:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-07 18:11:45 +0100 |
| commit | 447d426373219e5aa0417beed6238a103bbef80f (patch) | |
| tree | e472ffefe89660dbc88ebca2d2e436ec481f86b5 /Source/WebCore/platform | |
| parent | cbb4d7cda345c2678aa649cc57bffce8ca84949a (diff) | |
| download | external_webkit-447d426373219e5aa0417beed6238a103bbef80f.zip external_webkit-447d426373219e5aa0417beed6238a103bbef80f.tar.gz external_webkit-447d426373219e5aa0417beed6238a103bbef80f.tar.bz2 | |
Update PlatformTouchEvent for Android to reflect upstreamed version
See http://trac.webkit.org/changeset/81685
Change-Id: Ibc6c1336b696e39f27fd88d9b4e90fe6918ceba8
Diffstat (limited to 'Source/WebCore/platform')
| -rw-r--r-- | Source/WebCore/platform/PlatformTouchEvent.h | 1 | ||||
| -rw-r--r-- | Source/WebCore/platform/android/PlatformTouchEventAndroid.cpp | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/Source/WebCore/platform/PlatformTouchEvent.h b/Source/WebCore/platform/PlatformTouchEvent.h index 080f2f9..2ca7c99 100644 --- a/Source/WebCore/platform/PlatformTouchEvent.h +++ b/Source/WebCore/platform/PlatformTouchEvent.h @@ -71,7 +71,6 @@ public: #if PLATFORM(QT) 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, const Vector<PlatformTouchPoint::State>&, int metaState); #elif PLATFORM(BREWMP) PlatformTouchEvent(AEEEvent, uint16 wParam, uint32 dwParam); diff --git a/Source/WebCore/platform/android/PlatformTouchEventAndroid.cpp b/Source/WebCore/platform/android/PlatformTouchEventAndroid.cpp index ba3b086..dd06400 100644 --- a/Source/WebCore/platform/android/PlatformTouchEventAndroid.cpp +++ b/Source/WebCore/platform/android/PlatformTouchEventAndroid.cpp @@ -38,7 +38,6 @@ enum AndroidMetaKeyState { META_SYM_ON = 0x04 }; -// 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, const Vector<PlatformTouchPoint::State>& states, int metaState) : m_type(type) , m_metaKey(false) @@ -46,7 +45,6 @@ PlatformTouchEvent::PlatformTouchEvent(const Vector<int>& ids, const Vector<IntP { 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], states[c])); m_altKey = metaState & META_ALT_ON; |