diff options
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/PlatformTouchEvent.h | 6 | ||||
| -rw-r--r-- | WebCore/platform/android/PlatformTouchEventAndroid.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/WebCore/platform/PlatformTouchEvent.h b/WebCore/platform/PlatformTouchEvent.h index 1f071ce..854db3c 100644 --- a/WebCore/platform/PlatformTouchEvent.h +++ b/WebCore/platform/PlatformTouchEvent.h @@ -60,7 +60,8 @@ public: #if PLATFORM(QT) PlatformTouchEvent(QTouchEvent*); #elif PLATFORM(ANDROID) - PlatformTouchEvent(const IntPoint& windowPos, TouchEventType, PlatformTouchPoint::State); + // TODO (benm): eventTime is new and needs to be upstream + PlatformTouchEvent(const IntPoint& windowPos, TouchEventType, PlatformTouchPoint::State, long eventTime); #endif TouchEventType type() const { return m_type; } @@ -71,6 +72,8 @@ public: bool shiftKey() const { return m_shiftKey; } bool metaKey() const { return m_metaKey; } + long eventTime() const { return m_eventTime; } + private: TouchEventType m_type; Vector<PlatformTouchPoint> m_touchPoints; @@ -78,6 +81,7 @@ private: bool m_altKey; bool m_shiftKey; bool m_metaKey; + long m_eventTime; }; } diff --git a/WebCore/platform/android/PlatformTouchEventAndroid.cpp b/WebCore/platform/android/PlatformTouchEventAndroid.cpp index 65d787d..d2fcebb 100644 --- a/WebCore/platform/android/PlatformTouchEventAndroid.cpp +++ b/WebCore/platform/android/PlatformTouchEventAndroid.cpp @@ -30,12 +30,14 @@ namespace WebCore { -PlatformTouchEvent::PlatformTouchEvent(const IntPoint& windowPos, TouchEventType type, PlatformTouchPoint::State state) +// TODO (benm): eventTime is new and needs to be upstream +PlatformTouchEvent::PlatformTouchEvent(const IntPoint& windowPos, TouchEventType type, PlatformTouchPoint::State state, long eventTime) : m_type(type) , m_ctrlKey(false) , m_altKey(false) , m_shiftKey(false) , m_metaKey(false) + , m_eventTime(eventTime) { m_touchPoints.append(PlatformTouchPoint(windowPos, state)); } |