diff options
| author | Ben Murdoch <benm@google.com> | 2010-02-22 15:00:01 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-02-23 15:41:31 +0000 |
| commit | 05dd33bc8f86dd92bb5fa0a29160cdce30eedd01 (patch) | |
| tree | 408309277f88c3096fcdeecece1b2a3ec6f16d2f /WebCore/page/EventHandler.cpp | |
| parent | 4c319d7f42caf55d18590789400692ea9d6109c1 (diff) | |
| download | external_webkit-05dd33bc8f86dd92bb5fa0a29160cdce30eedd01.zip external_webkit-05dd33bc8f86dd92bb5fa0a29160cdce30eedd01.tar.gz external_webkit-05dd33bc8f86dd92bb5fa0a29160cdce30eedd01.tar.bz2 | |
Co-ordinates of a TouchEvent object should be 0,0 to match the behavior on iPhone. It is the co-ordinates of the Touch object wrapped up by a touch event that should update with motion.
Update EventHandler::handleTouchEvent to match what landed to webkit in http://trac.webkit.org/changeset/55146
Change-Id: I91dfcfbbb53020b85f646bcf58eb4f3afd6be8e7
Diffstat (limited to 'WebCore/page/EventHandler.cpp')
| -rw-r--r-- | WebCore/page/EventHandler.cpp | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp index 39fe724..9a3b1ec 100644 --- a/WebCore/page/EventHandler.cpp +++ b/WebCore/page/EventHandler.cpp @@ -2631,8 +2631,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) #endif ) && !i) { m_touchEventTarget = target; - m_firstTouchScreenPos = point.screenPos(); - m_firstTouchPagePos = pagePoint; } // Check to see if this should be added to targetTouches. @@ -2696,9 +2694,7 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) RefPtr<TouchEvent> cancelEv = TouchEvent::create(TouchList::create().get(), TouchList::create().get(), cancelTouches.get(), *eventName, m_touchEventTarget->document()->defaultView(), - m_firstTouchScreenPos.x(), m_firstTouchScreenPos.y(), - m_firstTouchPagePos.x(), m_firstTouchPagePos.y(), - event.ctrlKey(), event.altKey(), event.shiftKey(), + 0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); #if PLATFORM(ANDROID) @@ -2714,9 +2710,7 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) RefPtr<TouchEvent> endEv = TouchEvent::create(touches.get(), targetTouches.get(), releasedTouches.get(), *eventName, m_touchEventTarget->document()->defaultView(), - m_firstTouchScreenPos.x(), m_firstTouchScreenPos.y(), - m_firstTouchPagePos.x(), m_firstTouchPagePos.y(), - event.ctrlKey(), event.altKey(), event.shiftKey(), + 0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); #if PLATFORM(ANDROID) endEv->setCreateTime(static_cast<DOMTimeStamp>(event.eventTime())); @@ -2736,9 +2730,7 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) RefPtr<TouchEvent> longpressEv = TouchEvent::create(touches.get(), targetTouches.get(), pressedTouches.get(), *eventName, m_touchEventTarget->document()->defaultView(), - m_firstTouchScreenPos.x(), m_firstTouchScreenPos.y(), - m_firstTouchPagePos.x(), m_firstTouchPagePos.y(), - event.ctrlKey(), event.altKey(), event.shiftKey(), + 0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); longpressEv->setCreateTime(static_cast<DOMTimeStamp>(event.eventTime())); @@ -2750,9 +2742,7 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) RefPtr<TouchEvent> doubleTapEv = TouchEvent::create(touches.get(), targetTouches.get(), pressedTouches.get(), *eventName, m_touchEventTarget->document()->defaultView(), - m_firstTouchScreenPos.x(), m_firstTouchScreenPos.y(), - m_firstTouchPagePos.x(), m_firstTouchPagePos.y(), - event.ctrlKey(), event.altKey(), event.shiftKey(), + 0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); doubleTapEv->setCreateTime(static_cast<DOMTimeStamp>(event.eventTime())); @@ -2765,9 +2755,7 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) RefPtr<TouchEvent> startEv = TouchEvent::create(touches.get(), targetTouches.get(), pressedTouches.get(), *eventName, m_touchEventTarget->document()->defaultView(), - m_firstTouchScreenPos.x(), m_firstTouchScreenPos.y(), - m_firstTouchPagePos.x(), m_firstTouchPagePos.y(), - event.ctrlKey(), event.altKey(), event.shiftKey(), + 0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); #if PLATFORM(ANDROID) startEv->setCreateTime(static_cast<DOMTimeStamp>(event.eventTime())); @@ -2787,9 +2775,7 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) RefPtr<TouchEvent> moveEv = TouchEvent::create(touches.get(), targetTouches.get(), movedTouches.get(), *eventName, m_touchEventTarget->document()->defaultView(), - m_firstTouchScreenPos.x(), m_firstTouchScreenPos.y(), - m_firstTouchPagePos.x(), m_firstTouchPagePos.y(), - event.ctrlKey(), event.altKey(), event.shiftKey(), + 0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); #if PLATFORM(ANDROID) moveEv->setCreateTime(static_cast<DOMTimeStamp>(event.eventTime())); |