diff options
| author | Steve Block <steveblock@google.com> | 2010-02-03 19:28:15 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:07:01 +0000 |
| commit | a161eb599140267f553b1efb6458ab4a899d700a (patch) | |
| tree | c9c5f747564982c616a16600ad58b15bedd91061 /WebCore/page | |
| parent | 8b17ffea299c44342b5479322adcb686277df548 (diff) | |
| download | external_webkit-a161eb599140267f553b1efb6458ab4a899d700a.zip external_webkit-a161eb599140267f553b1efb6458ab4a899d700a.tar.gz external_webkit-a161eb599140267f553b1efb6458ab4a899d700a.tar.bz2 | |
Merge webkit.org at r54127 : Fix conflicts with Android addition of touch event time
This is not yet upstreamed, so we keep ours.
See https://android-git.corp.google.com/g/#change,39424
Change-Id: I65233af30227b7dd84a1c2b29e5dfc6da20e905e
Diffstat (limited to 'WebCore/page')
| -rw-r--r-- | WebCore/page/EventHandler.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp index 8a008dc..51cf675 100644 --- a/WebCore/page/EventHandler.cpp +++ b/WebCore/page/EventHandler.cpp @@ -2654,13 +2654,10 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) m_firstTouchPagePos.x(), m_firstTouchPagePos.y(), event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); -<<<<<<< HEAD + #if PLATFORM(ANDROID) cancelEv->setCreateTime(static_cast<DOMTimeStamp>(event.eventTime())); #endif -======= - ->>>>>>> webkit.org at r54127 ExceptionCode ec = 0; m_touchEventTarget->dispatchEvent(cancelEv.get(), ec); defaultPrevented |= cancelEv->defaultPrevented(); @@ -2675,12 +2672,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) m_firstTouchPagePos.x(), m_firstTouchPagePos.y(), event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); -<<<<<<< HEAD #if PLATFORM(ANDROID) endEv->setCreateTime(static_cast<DOMTimeStamp>(event.eventTime())); #endif -======= ->>>>>>> webkit.org at r54127 ExceptionCode ec = 0; m_touchEventTarget->dispatchEvent(endEv.get(), ec); #if PLATFORM(ANDROID) @@ -2758,12 +2752,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) m_firstTouchPagePos.x(), m_firstTouchPagePos.y(), event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); -<<<<<<< HEAD #if PLATFORM(ANDROID) moveEv->setCreateTime(static_cast<DOMTimeStamp>(event.eventTime())); #endif -======= ->>>>>>> webkit.org at r54127 ExceptionCode ec = 0; m_touchEventTarget->dispatchEvent(moveEv.get(), ec); defaultPrevented |= moveEv->defaultPrevented(); |