Changeset 150588 in webkit

Timestamp:

May 23, 2013 9:11:25 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] The web context does not contain any link properties if the context node is an image enclosed by a link node
​https://bugs.webkit.org/show_bug.cgi?id=116627

Patch by Ed Baker <​edbaker@blackberry.com> on 2013-05-23
Reviewed by Xan Lopez.

PR #341084

If the context node has an image tag and an enclosing link node was detected then add the link properties to the context.

Internally Reviewed by Gen Mak.

• Api/WebPage.cpp:

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

Location:

trunk/Source/WebKit/blackberry

Files:

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

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

@@ -2162 +2162 @@
 
     bool nodeAllowSelectionOverride = false;
+    bool nodeIsImage = node->isHTMLElement() && node->hasTagName(HTMLNames::imgTag);
     Node* linkNode = node->enclosingLinkEventParentOrSelf();
     // 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)) {
+    if (linkNode && (node == linkNode || node->isTextNode() || nodeIsImage)) {
         KURL href;
         if (linkNode->isLink() && linkNode->hasAttributes()) {

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-05-23  Ed Baker  <edbaker@blackberry.com>
+
+        [BlackBerry] The web context does not contain any link properties if the context node is an image enclosed by a link node
+        https://bugs.webkit.org/show_bug.cgi?id=116627
+
+        Reviewed by Xan Lopez.
+
+        PR #341084
+
+        If the context node has an image tag and an enclosing link node was detected then add the link properties to the context.
+
+        Internally Reviewed by Gen Mak.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::webContext):
+
 2013-05-23  Mike Fenton  <mifenton@rim.com>