diff options
| author | Grace Kloba <klobag@google.com> | 2010-02-02 19:08:37 -0800 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2010-02-03 09:45:07 -0800 |
| commit | 22c64e5cc7b7c54cea1cf6cb3bb1021f072e365c (patch) | |
| tree | d556cec3ecc5cbbde2ada12a9d5100d4c73d7d62 /WebCore/page/EventHandler.cpp | |
| parent | 52d25f0b47a8bb2c38de3a8429316221f742b8f9 (diff) | |
| download | external_webkit-22c64e5cc7b7c54cea1cf6cb3bb1021f072e365c.zip external_webkit-22c64e5cc7b7c54cea1cf6cb3bb1021f072e365c.tar.gz external_webkit-22c64e5cc7b7c54cea1cf6cb3bb1021f072e365c.tar.bz2 | |
Pass touch event time from Java to WebKit
merge from https://android-git.corp.google.com/g/#change,39356
Diffstat (limited to 'WebCore/page/EventHandler.cpp')
| -rw-r--r-- | WebCore/page/EventHandler.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
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<DOMTimeStamp>(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<DOMTimeStamp>(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<DOMTimeStamp>(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<DOMTimeStamp>(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<DOMTimeStamp>(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<DOMTimeStamp>(event.eventTime())); +#endif ExceptionCode ec = 0; m_touchEventTarget->dispatchEvent(moveEv.get(), ec); defaultPrevented |= moveEv->defaultPrevented(); |