Source/WebCore/page/EventHandler.cpp - Issue 10988006: Merge 128999 - Do touch adjustment on GestureTapDown

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/page/EventHandler.cpp

Issue 10988006: Merge 128999 - Do touch adjustment on GestureTapDown (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/

Patch Set: Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « LayoutTests/touchadjustment/touch-links-active-expected.txt ('k') | Tools/DumpRenderTree/chromium/TestRunner/EventSender.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/page/EventHandler.cpp

===================================================================

--- Source/WebCore/page/EventHandler.cpp (revision 129420)

+++ Source/WebCore/page/EventHandler.cpp (working copy)

@@ -2414,10 +2414,15 @@

if (gestureEvent.type() == PlatformEvent::GestureScrollEnd || gestureEvent.type() == PlatformEvent::GestureScrollUpdate)

eventTarget = m_scrollGestureHandlingNode.get();

+ IntPoint adjustedPoint = gestureEvent.position();

HitTestRequest::HitTestRequestType hitType = HitTestRequest::TouchEvent;

- if (gestureEvent.type() == PlatformEvent::GestureTapDown)

+ if (gestureEvent.type() == PlatformEvent::GestureTapDown) {

+#if ENABLE(TOUCH_ADJUSTMENT)

+ if (!gestureEvent.area().isEmpty())

+ adjustGesturePosition(gestureEvent, adjustedPoint);

+#endif

hitType |= HitTestRequest::Active;

- else if (gestureEvent.type() == PlatformEvent::GestureTap || gestureEvent.type() == PlatformEvent::GestureTapDownCancel)

+ } else if (gestureEvent.type() == PlatformEvent::GestureTap || gestureEvent.type() == PlatformEvent::GestureTapDownCancel)

hitType |= HitTestRequest::Release;

else

hitType |= HitTestRequest::Active | HitTestRequest::ReadOnly;

@@ -2426,7 +2431,7 @@

hitType |= HitTestRequest::ReadOnly;

if (!eventTarget || !(hitType & HitTestRequest::ReadOnly)) {

- IntPoint hitTestPoint = m_frame->view()->windowToContents(gestureEvent.position());

+ IntPoint hitTestPoint = m_frame->view()->windowToContents(adjustedPoint);

HitTestResult result = hitTestResultAtPoint(hitTestPoint, false, false, DontHitTestScrollbars, hitType);

eventTarget = result.targetNode();

}

@@ -2574,6 +2579,7 @@

Node* targetNode = 0;

switch (gestureEvent.type()) {

case PlatformEvent::GestureTap:

+ case PlatformEvent::GestureTapDown:

bestClickableNodeForTouchPoint(gestureEvent.position(), IntSize(gestureEvent.area().width() / 2, gestureEvent.area().height() / 2), adjustedPoint, targetNode);

break;

case PlatformEvent::GestureLongPress: