diff options
| author | Steve Block <steveblock@google.com> | 2010-02-01 16:30:22 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-01 16:30:22 +0000 |
| commit | 5f17e4c7a30a97ea3f000145b03b0aa9da8b5e66 (patch) | |
| tree | 26e6df84bfb9dc7a99f2c9bfcfb292d27d15c5e6 | |
| parent | e566177588db97824429f0ab784623d38d866224 (diff) | |
| download | external_webkit-5f17e4c7a30a97ea3f000145b03b0aa9da8b5e66.zip external_webkit-5f17e4c7a30a97ea3f000145b03b0aa9da8b5e66.tar.gz external_webkit-5f17e4c7a30a97ea3f000145b03b0aa9da8b5e66.tar.bz2 | |
Update Android to reflect final version submitted to webkit.org when changing touchevents behavior
See http://trac.webkit.org/changeset/52922
Change-Id: I2057acd590a540744a4d7db6fe9b29b887339906
| -rw-r--r-- | WebCore/page/EventHandler.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp index 8bde8b9..6153c16 100644 --- a/WebCore/page/EventHandler.cpp +++ b/WebCore/page/EventHandler.cpp @@ -2667,22 +2667,19 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) if (releasedTouches->length() > 0) { eventName = &eventNames().touchendEvent; - - RefPtr<TouchEvent> endEv = + 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(), event.metaKey()); - ExceptionCode ec = 0; m_touchEventTarget->dispatchEvent(endEv.get(), ec); defaultPrevented |= endEv->defaultPrevented(); } - if (pressedTouches->length() > 0) { - // Add pressed touchpoints to touches and targetTouches. + // Add pressed touchpoints to touches and targetTouches for (int i = 0; i < pressedTouches->length(); ++i) { touches->append(pressedTouches->item(i)); if (m_touchEventTarget == pressedTouches->item(i)->target()) @@ -2719,7 +2716,7 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) } else { #endif eventName = &eventNames().touchstartEvent; - RefPtr<TouchEvent> startEv = + RefPtr<TouchEvent> startEv = TouchEvent::create(touches.get(), targetTouches.get(), pressedTouches.get(), *eventName, m_touchEventTarget->document()->defaultView(), m_firstTouchScreenPos.x(), m_firstTouchScreenPos.y(), @@ -2738,7 +2735,7 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) if (movedTouches->length() > 0) { eventName = &eventNames().touchmoveEvent; - RefPtr<TouchEvent> moveEv = + RefPtr<TouchEvent> moveEv = TouchEvent::create(touches.get(), targetTouches.get(), movedTouches.get(), *eventName, m_touchEventTarget->document()->defaultView(), m_firstTouchScreenPos.x(), m_firstTouchScreenPos.y(), @@ -2750,7 +2747,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) defaultPrevented |= moveEv->defaultPrevented(); } - if (event.type() == TouchEnd || event.type() == TouchCancel) m_touchEventTarget = 0; |