diff options
| author | Ben Murdoch <benm@google.com> | 2010-03-11 09:39:27 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-11 09:39:27 -0800 |
| commit | b3521bb4bae36e8cde56e41c42b0ccb8d1eef604 (patch) | |
| tree | 93a559f83bf51dcc2bf174565c7e646bc6dac1d0 /WebCore/page | |
| parent | aa699fff907b14728bd8e515e3ae498620ed9afe (diff) | |
| parent | 0361ff17d43cdfdc6c9d3ae65e8716a4cbeed862 (diff) | |
| download | external_webkit-b3521bb4bae36e8cde56e41c42b0ccb8d1eef604.zip external_webkit-b3521bb4bae36e8cde56e41c42b0ccb8d1eef604.tar.gz external_webkit-b3521bb4bae36e8cde56e41c42b0ccb8d1eef604.tar.bz2 | |
Merge "Prepare touch key modifiers for upstreaming."
Diffstat (limited to 'WebCore/page')
| -rw-r--r-- | WebCore/page/EventHandler.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp index 233fd05..6082cfe 100644 --- a/WebCore/page/EventHandler.cpp +++ b/WebCore/page/EventHandler.cpp @@ -2554,7 +2554,7 @@ static PassRefPtr<TouchList> assembleTargetTouches(Touch* touchTarget, TouchList { RefPtr<TouchList> targetTouches = TouchList::create(); - for (int i = 0; i < touches->length(); ++i) { + for (unsigned i = 0; i < touches->length(); ++i) { if (touches->item(i)->target()->toNode()->isSameNode(touchTarget->target()->toNode())) targetTouches->append(touches->item(i)); } @@ -2573,7 +2573,7 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) const Vector<PlatformTouchPoint>& points = event.touchPoints(); AtomicString* eventName = 0; - for (int i = 0; i < points.size(); ++i) { + for (unsigned i = 0; i < points.size(); ++i) { const PlatformTouchPoint& point = points[i]; IntPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); HitTestResult result = hitTestResultAtPoint(pagePoint, /*allowShadowContent*/ false); @@ -2653,7 +2653,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) *eventName, touchEventTarget->toNode()->document()->defaultView(), 0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); - ExceptionCode ec = 0; touchEventTarget->dispatchEvent(cancelEv.get(), ec); defaultPrevented |= cancelEv->defaultPrevented(); @@ -2693,7 +2692,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) *eventName, touchEventTarget->toNode()->document()->defaultView(), 0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); - ExceptionCode ec = 0; touchEventTarget->dispatchEvent(longpressEv.get(), ec); defaultPrevented |= longpressEv->defaultPrevented(); @@ -2704,7 +2702,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) *eventName, touchEventTarget->toNode()->document()->defaultView(), 0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey()); - ExceptionCode ec = 0; touchEventTarget->dispatchEvent(doubleTapEv.get(), ec); defaultPrevented |= doubleTapEv->defaultPrevented(); |