diff options
| author | Ben Murdoch <benm@google.com> | 2010-02-23 07:57:35 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-23 07:57:35 -0800 |
| commit | 976279e0c25755d59d66061900ba48b602ecceec (patch) | |
| tree | 71f58ffab045d797bde56958b2e82087ca52583b /WebCore/page | |
| parent | 0619f0601ffda6f9b1e7ef9870de4a6d14defbd1 (diff) | |
| parent | 05dd33bc8f86dd92bb5fa0a29160cdce30eedd01 (diff) | |
| download | external_webkit-976279e0c25755d59d66061900ba48b602ecceec.zip external_webkit-976279e0c25755d59d66061900ba48b602ecceec.tar.gz external_webkit-976279e0c25755d59d66061900ba48b602ecceec.tar.bz2 | |
Merge "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."
Diffstat (limited to 'WebCore/page')
| -rw-r--r-- | WebCore/page/EventHandler.cpp | 26 | ||||
| -rw-r--r-- | WebCore/page/EventHandler.h | 2 |
2 files changed, 6 insertions, 22 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())); diff --git a/WebCore/page/EventHandler.h b/WebCore/page/EventHandler.h index e871f61..759be2b 100644 --- a/WebCore/page/EventHandler.h +++ b/WebCore/page/EventHandler.h @@ -432,8 +432,6 @@ private: typedef HashMap<int, RefPtr<EventTarget> > TouchTargetMap; TouchTargetMap m_originatingTouchPointTargets; RefPtr<Node> m_touchEventTarget; - IntPoint m_firstTouchScreenPos; - IntPoint m_firstTouchPagePos; #endif }; |