Changeset 147687 in webkit

Timestamp:

Apr 4, 2013 5:26:29 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Adjust fatfinger result priority
​https://bugs.webkit.org/show_bug.cgi?id=113957

Patch by Tiancheng Jiang <​tijiang@rim.com> on 2013-04-04
Reviewed by Rob Buis.

RIM PR 224781
Internally Reviewed by Genevieve Mak.

Change fatfigner algorithm, return the clickable element rather than
its parent anchor. Modify taphighlight and context menu node selection
accordingly.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::webContext):

• WebKitSupport/FatFingers.cpp:

(BlackBerry::WebKit::FatFingers::findBestPoint):

• WebKitSupport/FatFingers.h:
• WebKitSupport/TouchEventHandler.cpp:

(BlackBerry::WebKit::elementForTapHighlight):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebKitSupport/FatFingers.cpp (modified) (3 diffs)
• WebKitSupport/FatFingers.h (modified) (1 diff)
• WebKitSupport/TouchEventHandler.cpp (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -2285 +2285 @@
 
     bool nodeAllowSelectionOverride = false;
-    if (Node* linkNode = node->enclosingLinkEventParentOrSelf()) {
+    Node* linkNode = node->enclosingLinkEventParentOrSelf();
+    if (node->isLink() || (node->isTextNode() && linkNode)) {
         KURL href;
         if (linkNode->isLink() && linkNode->hasAttributes()) {

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-04-04  Tiancheng Jiang  <tijiang@rim.com>
+
+        [BlackBerry] Adjust fatfinger result priority
+        https://bugs.webkit.org/show_bug.cgi?id=113957
+
+        Reviewed by Rob Buis.
+
+        RIM PR 224781
+        Internally Reviewed by Genevieve Mak.
+
+        Change fatfigner algorithm, return the clickable element rather than
+        its parent anchor. Modify taphighlight and context menu node selection
+        accordingly.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::webContext):
+        * WebKitSupport/FatFingers.cpp:
+        (BlackBerry::WebKit::FatFingers::findBestPoint):
+        * WebKitSupport/FatFingers.h:
+        * WebKitSupport/TouchEventHandler.cpp:
+        (BlackBerry::WebKit::elementForTapHighlight):
+
 2013-04-03  Arvid Nilsson  <anilsson@rim.com>
 

trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp

@@ -164 +164 @@
     // Lets set nodeUnderFatFinger to the result of a point based hit test here. If something
     // targable is actually found by ::findIntersectingRegions, then we might replace what we just set below later on.
-    Element* elementUnderPoint;
-    Element* clickableElementUnderPoint;
-    getRelevantInfoFromCachedHitTest(elementUnderPoint, clickableElementUnderPoint);
+    const HitTestResult& hitResult = m_webPage->hitTestResult(m_contentPos);
+    Node* node = hitResult.innerNode();
+    while (node && !node->isElementNode())
+        node = node->parentNode();
+
+    Element* elementUnderPoint = static_cast<Element*>(node);
 
     if (elementUnderPoint) {
@@ -173 +176 @@
         // If we are looking for a Clickable Element and we found one, we can quit early.
         if (m_targetType == ClickableElement) {
-            if (clickableElementUnderPoint) {
-                setSuccessfulFatFingersResult(result, clickableElementUnderPoint, m_contentPos /*adjustedPosition*/);
+            if (isElementClickable(elementUnderPoint)) {
+                setSuccessfulFatFingersResult(result, elementUnderPoint, m_contentPos /*adjustedPosition*/);
                 return result;
             }
-
-            if (isElementClickable(elementUnderPoint)) {
-                setSuccessfulFatFingersResult(result, elementUnderPoint, m_contentPos /*adjustedPosition*/);
+            if (hitResult.URLElement()) {
+                setSuccessfulFatFingersResult(result, hitResult.URLElement(), m_contentPos /*adjustedPosition*/);
                 return result;
             }
@@ -475 +477 @@
 }
 
-void FatFingers::getRelevantInfoFromCachedHitTest(Element*& elementUnderPoint, Element*& clickableElementUnderPoint) const
-{
-    elementUnderPoint = 0;
-    clickableElementUnderPoint = 0;
-
-    const HitTestResult& result = m_webPage->hitTestResult(m_contentPos);
-    Node* node = result.innerNode();
-    while (node && !node->isElementNode())
-        node = node->parentNode();
-
-    elementUnderPoint = toElement(node);
-    clickableElementUnderPoint = result.URLElement();
-}
-
 void FatFingers::setSuccessfulFatFingersResult(FatFingersResult& result, Node* bestNode, const WebCore::IntPoint& adjustedPoint)
 {

trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.h

@@ -98 +98 @@
     void getNodesFromRect(WebCore::Document*, const WebCore::IntPoint&, ListHashSet<RefPtr<WebCore::Node> >&);
 
-    // It mimics Document::elementFromPoint, but recursively hit-tests in case an inner frame is found.
-    void getRelevantInfoFromCachedHitTest(WebCore::Element*& elementUnderPoint, WebCore::Element*& clickableElementUnderPoint) const;
-
     bool isElementClickable(WebCore::Element*) const;
 

trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp

@@ -196 +196 @@
 
     bool isArea = elementUnderFatFinger->hasTagName(HTMLNames::areaTag);
-    Node* linkNode = elementUnderFatFinger->enclosingLinkEventParentOrSelf();
+    Node* linkNode = elementUnderFatFinger->isLink() ? elementUnderFatFinger : 0;
     if (!linkNode || !linkNode->isHTMLElement() || (!linkNode->renderer() && !isArea))
         return 0;