diff options
| author | Steve Block <steveblock@google.com> | 2010-02-01 16:36:28 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-01 16:36:28 +0000 |
| commit | 0647d20051006653118db0903488325680beeb52 (patch) | |
| tree | 87d207ef3a78307da4f8a25820f8488c589cdbca /WebCore/page/EventHandler.cpp | |
| parent | 5f17e4c7a30a97ea3f000145b03b0aa9da8b5e66 (diff) | |
| download | external_webkit-0647d20051006653118db0903488325680beeb52.zip external_webkit-0647d20051006653118db0903488325680beeb52.tar.gz external_webkit-0647d20051006653118db0903488325680beeb52.tar.bz2 | |
Add ANDROID tags to some touchevents changes that have yet to be upstreamed
Change-Id: Ie67cdb2c404c59589f282b2b4494507d5c606f11
Diffstat (limited to 'WebCore/page/EventHandler.cpp')
| -rw-r--r-- | WebCore/page/EventHandler.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp index 6153c16..cb3bca6 100644 --- a/WebCore/page/EventHandler.cpp +++ b/WebCore/page/EventHandler.cpp @@ -2603,7 +2603,7 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) int adjustedPageX = lroundf(pagePoint.x() / m_frame->pageZoomFactor()); int adjustedPageY = lroundf(pagePoint.y() / m_frame->pageZoomFactor()); - if ( (event.type() == TouchStart + if ((event.type() == TouchStart #if PLATFORM(ANDROID) || event.type() == TouchDoubleTap || event.type() == TouchLongPress @@ -2614,6 +2614,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) m_firstTouchPagePos = pagePoint; } + // ANDROID + // The touch event should act on m_touchEventTarget, not target + // TODO: Upstream this fix to webkit.org RefPtr<Touch> touch = Touch::create(doc->frame(), m_touchEventTarget.get(), point.id(), point.screenPos().x(), point.screenPos().y(), adjustedPageX, adjustedPageY); @@ -2676,7 +2679,11 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) event.metaKey()); ExceptionCode ec = 0; m_touchEventTarget->dispatchEvent(endEv.get(), ec); +#if PLATFORM(ANDROID) defaultPrevented |= endEv->defaultPrevented(); +#else + defaultPrevented = endEv->defaultPrevented(); +#endif } if (pressedTouches->length() > 0) { // Add pressed touchpoints to touches and targetTouches |