Changeset 148624 in webkit

Timestamp:

Apr 17, 2013, 12:14:30 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Check image node with usemap attribute isLink failed
​https://bugs.webkit.org/show_bug.cgi?id=114751

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

PR 326780
Internally Reviewed by Liam Quinn.

An image node with usemap will crash when call isLink.
If the node is linkNode, bring up the CCM(eg. linked image).
Also use toElement method as agomes suggested in pr 113957.

• Api/WebPage.cpp:

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

• WebKitSupport/FatFingers.cpp:

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

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebKitSupport/FatFingers.cpp (modified) (1 diff)

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

@@ -2162 +2162 @@
     bool nodeAllowSelectionOverride = false;
     Node* linkNode = node->enclosingLinkEventParentOrSelf();
-    if (node->isLink() || (node->isTextNode() && linkNode)) {
+    // Set link url only when the node is linked image, or text inside anchor. Prevent CCM popup when long press non-link element(eg. button) inside an anchor.
+    if ((node == linkNode) || (node->isTextNode() && linkNode)) {
         KURL href;
         if (linkNode->isLink() && linkNode->hasAttributes()) {

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-04-17  Tiancheng Jiang  <tijiang@rim.com>
+
+        [BlackBerry] Check image node with usemap attribute isLink failed
+        https://bugs.webkit.org/show_bug.cgi?id=114751
+
+        Reviewed by Rob Buis.
+
+        PR 326780
+        Internally Reviewed by Liam Quinn.
+
+        An image node with usemap will crash when call isLink.
+        If the node is linkNode, bring up the CCM(eg. linked image).
+        Also use toElement method as agomes suggested in pr 113957.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::webContext):
+        * WebKitSupport/FatFingers.cpp:
+        (BlackBerry::WebKit::FatFingers::findBestPoint):
+
 2013-04-16  Nima Ghanavatian  <nghanavatian@blackberry.com>
 

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

@@ -171 +171 @@
         node = node->parentNode();
 
-    Element* elementUnderPoint = static_cast<Element*>(node);
+    Element* elementUnderPoint = toElement(node);
 
     if (elementUnderPoint) {