Changeset 139904 in webkit

Timestamp:

Jan 16, 2013 11:48:44 AM (11 years ago)

Author:

wjmaclean@chromium.org

Message:

LinkHighlight should use touch adjustment to match active state on GestureTapDown.
​https://bugs.webkit.org/show_bug.cgi?id=107032

Reviewed by Adam Barth.

Source/WebKit/chromium:

LinkHighlight node selection should produce results that match the node marked
active during GestureTapDown.

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::bestTouchLinkNode):

• tests/LinkHighlightTest.cpp:

(WebCore::TEST):

LayoutTests:

• platform/chromium-linux/compositing/gestures/gesture-tapHighlight-simple-multi-line.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium-linux/compositing/gestures/gesture-tapHighlight-simple-multi-line.html (modified) (2 diffs)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/WebViewImpl.cpp (modified) (1 diff)
• Source/WebKit/chromium/tests/LinkHighlightTest.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-16  W. James MacLean  <wjmaclean@chromium.org>
+
+        LinkHighlight should use touch adjustment to match active state on GestureTapDown.
+        https://bugs.webkit.org/show_bug.cgi?id=107032
+
+        Reviewed by Adam Barth.
+
+        * platform/chromium-linux/compositing/gestures/gesture-tapHighlight-simple-multi-line.html:
+
 2013-01-16  Levi Weintraub  <leviw@chromium.org>
 

trunk/LayoutTests/platform/chromium-linux/compositing/gestures/gesture-tapHighlight-simple-multi-line.html

@@ -16 +16 @@
     x = (clientRect.left + clientRect.right) / 2;
     y = (clientRect.top + clientRect.bottom) / 2;
+    touchWidth = (clientRect.right - clientRect.left) / 4;
+    touchHeight = (clientRect.bottom - clientRect.top) / 4;
     if (window.testRunner) {
         testRunner.dumpAsText(true);
@@ -22 +24 @@
 
     if (window.eventSender) {
-        eventSender.gestureTapDown(x, y);
+        eventSender.gestureTapDown(x, y, touchWidth, touchHeight);
         window.setTimeout(function() { window.testRunner.notifyDone(); }, 0);
     } else {

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-16  W. James MacLean  <wjmaclean@chromium.org>
+
+        LinkHighlight should use touch adjustment to match active state on GestureTapDown.
+        https://bugs.webkit.org/show_bug.cgi?id=107032
+
+        Reviewed by Adam Barth.
+
+        LinkHighlight node selection should produce results that match the node marked
+        active during GestureTapDown.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::bestTouchLinkNode):
+        * tests/LinkHighlightTest.cpp:
+        (WebCore::TEST):
+
 2013-01-16  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -1225 +1225 @@
     Node* bestTouchNode = 0;
 
-    // FIXME: Should accept a search region from the caller instead of hard-coding the size.
-    IntSize touchEventSearchRegionSize(4, 2);
+    IntSize touchEventSearchRegionSize(touchEvent.data.tapDown.width / 2, touchEvent.data.tapDown.height / 2);
     IntPoint touchEventLocation(touchEvent.x, touchEvent.y);
-    m_page->mainFrame()->eventHandler()->bestClickableNodeForTouchPoint(touchEventLocation, touchEventSearchRegionSize, touchEventLocation, bestTouchNode);
-    // bestClickableNodeForTouchPoint() doesn't always return a node that is a link, so let's try and find
-    // a link to highlight.
+#if ENABLE(TOUCH_ADJUSTMENT)
+    m_page->mainFrame()->eventHandler()->adjustGesturePosition(PlatformGestureEventBuilder(mainFrameImpl()->frameView(), touchEvent), touchEventLocation);
+#endif
+
+    IntPoint hitTestPoint = m_page->mainFrame()->view()->windowToContents(touchEventLocation);
+    HitTestResult result = m_page->mainFrame()->eventHandler()->hitTestResultAtPoint(
+        hitTestPoint, false, false, DontHitTestScrollbars, HitTestRequest::TouchEvent);
+    bestTouchNode = result.targetNode();
+
+    // Make sure our highlight candidate uses a hand cursor as a heuristic to
+    // choose appropriate targets.
     bool shiftKey = touchEvent.modifiers & WebGestureEvent::ShiftKey;
     while (bestTouchNode && !invokesHandCursor(bestTouchNode, shiftKey, m_page->mainFrame()))

trunk/Source/WebKit/chromium/tests/LinkHighlightTest.cpp

@@ -62 +62 @@
 
     WebGestureEvent touchEvent;
+    touchEvent.type = WebInputEvent::GestureTapDown;
 
     // The coordinates below are linked to absolute positions in the referenced .html file.