[Qt] Taps are sometimes not highlighted.

https://bugs.webkit.org/show_bug.cgi?id=82188

Patch by Allan Sandfeld Jensen <allan.jensen@nokia.com> on 2012-03-26
Reviewed by Kenneth Rohde Christiansen.

Highlight any focusable parent element, or if none is found at least
the element returned by bestClickableNodeForTouchPoint.

* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::highlightPotentialActivation):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@112084 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 9685fcc7c7f21440a5cd9fe79bc0d7f4aa6af117..d90989cbddd6f6bc6e5ea74664b3ba1f0a43447c 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2012-03-26  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        [Qt] Taps are sometimes not highlighted.
+        https://bugs.webkit.org/show_bug.cgi?id=82188
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Highlight any focusable parent element, or if none is found at least
+        the element returned by bestClickableNodeForTouchPoint.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::highlightPotentialActivation):
+
 2012-03-26  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r111993.

diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
index 6b82463cc6af32c62403dbe54d21c0bff7bcdfdc..9992f5bc71cc531ebb02e1bbd49c2b1ec1d3726e 100644 (file)
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -1461,8 +1461,14 @@ void WebPage::highlightPotentialActivation(const IntPoint& point, const IntSize&
         HitTestResult result = mainframe->eventHandler()->hitTestResultAtPoint(mainframe->view()->windowToContents(point), /*allowShadowContent*/ false, /*ignoreClipping*/ true);
         activationNode = result.innerNode();
 #endif
-        if (activationNode && !activationNode->isFocusable())
-            activationNode = activationNode->enclosingLinkEventParentOrSelf();
+        if (activationNode && !activationNode->isFocusable()) {
+            for (Node* node = activationNode; node; node = node->parentOrHostNode()) {
+                if (node->isFocusable()) {
+                    activationNode = node;
+                    break;
+                }
+            }
+        }
     }
 
     if (activationNode)