summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/WebCore/platform/PlatformTouchEvent.h1
-rw-r--r--Source/WebCore/platform/android/PlatformTouchEventAndroid.cpp2
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;