From 22c64e5cc7b7c54cea1cf6cb3bb1021f072e365c Mon Sep 17 00:00:00 2001 From: Grace Kloba Date: Tue, 2 Feb 2010 19:08:37 -0800 Subject: Pass touch event time from Java to WebKit merge from https://android-git.corp.google.com/g/#change,39356 --- WebCore/page/EventHandler.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'WebCore/page/EventHandler.cpp') diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp index cb3bca6..bdcd6aa 100644 --- a/WebCore/page/EventHandler.cpp +++ b/WebCore/page/EventHandler.cpp @@ -2662,7 +2662,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) m_firstTouchPagePos.x(), m_firstTouchPagePos.y(), event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); - +#if PLATFORM(ANDROID) + cancelEv->setCreateTime(static_cast(event.eventTime())); +#endif ExceptionCode ec = 0; m_touchEventTarget->dispatchEvent(cancelEv.get(), ec); defaultPrevented |= cancelEv->defaultPrevented(); @@ -2677,6 +2679,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) m_firstTouchPagePos.x(), m_firstTouchPagePos.y(), event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); +#if PLATFORM(ANDROID) + endEv->setCreateTime(static_cast(event.eventTime())); +#endif ExceptionCode ec = 0; m_touchEventTarget->dispatchEvent(endEv.get(), ec); #if PLATFORM(ANDROID) @@ -2703,6 +2708,7 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) m_firstTouchPagePos.x(), m_firstTouchPagePos.y(), event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); + longpressEv->setCreateTime(static_cast(event.eventTime())); ExceptionCode ec = 0; m_touchEventTarget->dispatchEvent(longpressEv.get(), ec); @@ -2716,6 +2722,7 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) m_firstTouchPagePos.x(), m_firstTouchPagePos.y(), event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); + doubleTapEv->setCreateTime(static_cast(event.eventTime())); ExceptionCode ec = 0; m_touchEventTarget->dispatchEvent(doubleTapEv.get(), ec); @@ -2730,6 +2737,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) m_firstTouchPagePos.x(), m_firstTouchPagePos.y(), event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); +#if PLATFORM(ANDROID) + startEv->setCreateTime(static_cast(event.eventTime())); +#endif ExceptionCode ec = 0; m_touchEventTarget->dispatchEvent(startEv.get(), ec); defaultPrevented |= startEv->defaultPrevented(); @@ -2749,6 +2759,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) m_firstTouchPagePos.x(), m_firstTouchPagePos.y(), event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); +#if PLATFORM(ANDROID) + moveEv->setCreateTime(static_cast(event.eventTime())); +#endif ExceptionCode ec = 0; m_touchEventTarget->dispatchEvent(moveEv.get(), ec); defaultPrevented |= moveEv->defaultPrevented(); -- cgit v1.1