summaryrefslogtreecommitdiffstats
path: root/WebCore/platform
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/platform')
-rw-r--r--WebCore/platform/PlatformTouchEvent.h9
-rw-r--r--WebCore/platform/android/PlatformTouchEventAndroid.cpp5
2 files changed, 3 insertions, 11 deletions
diff --git a/WebCore/platform/PlatformTouchEvent.h b/WebCore/platform/PlatformTouchEvent.h
index 56d1020..7e2ac84 100644
--- a/WebCore/platform/PlatformTouchEvent.h
+++ b/WebCore/platform/PlatformTouchEvent.h
@@ -61,7 +61,7 @@ public:
PlatformTouchEvent(QTouchEvent*);
#elif PLATFORM(ANDROID)
// TODO (benm): eventTime and metaState are new and need to be upstreamed.
- PlatformTouchEvent(const IntPoint& windowPos, TouchEventType, PlatformTouchPoint::State, long eventTime, int metaState);
+ PlatformTouchEvent(const IntPoint& windowPos, TouchEventType, PlatformTouchPoint::State, int metaState);
#endif
TouchEventType type() const { return m_type; }
@@ -72,10 +72,6 @@ public:
bool shiftKey() const { return m_shiftKey; }
bool metaKey() const { return m_metaKey; }
-#if PLATFORM(ANDROID)
- long eventTime() const { return m_eventTime; }
-#endif
-
private:
TouchEventType m_type;
Vector<PlatformTouchPoint> m_touchPoints;
@@ -83,9 +79,6 @@ private:
bool m_altKey;
bool m_shiftKey;
bool m_metaKey;
-#if PLATFORM(ANDROID)
- long m_eventTime;
-#endif
};
}
diff --git a/WebCore/platform/android/PlatformTouchEventAndroid.cpp b/WebCore/platform/android/PlatformTouchEventAndroid.cpp
index 085eb0a..0b3ac13 100644
--- a/WebCore/platform/android/PlatformTouchEventAndroid.cpp
+++ b/WebCore/platform/android/PlatformTouchEventAndroid.cpp
@@ -38,11 +38,10 @@ enum AndroidMetaKeyState {
META_SYM_ON = 0x04
};
-// TODO (benm): eventTime and metaState are new and needs to be upstreamed.
-PlatformTouchEvent::PlatformTouchEvent(const IntPoint& windowPos, TouchEventType type, PlatformTouchPoint::State state, long eventTime, int metaState)
+// TODO (benm): metaState are new and needs to be upstreamed.
+PlatformTouchEvent::PlatformTouchEvent(const IntPoint& windowPos, TouchEventType type, PlatformTouchPoint::State state, int metaState)
: m_type(type)
, m_metaKey(false)
- , m_eventTime(eventTime)
{
m_touchPoints.append(PlatformTouchPoint(windowPos, state));