Changeset 60834 in webkit

Timestamp:

Jun 8, 2010 4:25:10 AM (14 years ago)

Author:

xan@webkit.org

Message:

2010-06-08 Xan Lopez <​xlopez@igalia.com>

Reviewed by Gustavo Noronha.

[GTK] Add inner-node property to WebKitHitTestResult
​https://bugs.webkit.org/show_bug.cgi?id=40131

Add a 'inner-node' property to WebKitHitTestResult, carrying the
DOM node where the hit test happened.

• tests/testhittestresult.c: (load_status_cb):
• webkit/webkithittestresult.cpp: (webkit_hit_test_result_get_property): (webkit_hit_test_result_set_property): (webkit_hit_test_result_class_init):
• webkit/webkitprivate.cpp: (WebKit::kit):

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• tests/testhittestresult.c (modified) (2 diffs)
• webkit/webkithittestresult.cpp (modified) (6 diffs)
• webkit/webkitprivate.cpp (modified) (3 diffs)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-06-08  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        [GTK] Add inner-node property to WebKitHitTestResult
+        https://bugs.webkit.org/show_bug.cgi?id=40131
+
+        Add a 'inner-node' property to WebKitHitTestResult, carrying the
+        DOM node where the hit test happened.
+
+        * tests/testhittestresult.c:
+        (load_status_cb):
+        * webkit/webkithittestresult.cpp:
+        (webkit_hit_test_result_get_property):
+        (webkit_hit_test_result_set_property):
+        (webkit_hit_test_result_class_init):
+        * webkit/webkitprivate.cpp:
+        (WebKit::kit):
+
 2010-06-07  Martin Robinson  <mrobinson@igalia.com>
 

trunk/WebKit/gtk/tests/testhittestresult.c

@@ -83 +83 @@
         guint context;
         GdkEventButton event;
+        WebKitDOMNode* node;
+
         event.type = GDK_BUTTON_PRESS;
         /* Close enough to 0,0 */
@@ -90 +92 @@
         result = webkit_web_view_get_hit_test_result(webView, &event);
         g_assert(result);
+
         g_object_get(result, "context", &context, NULL);
         g_assert(context & info->flag);
+
+        g_object_get(result, "inner-node", &node, NULL);
+        g_assert(node);
+        g_assert(WEBKIT_DOM_IS_NODE(node));
+        /* We can only test these node types at the moment. In the
+         * input case there seems to be an extra layer with a DIV on
+         * top of the input, which gets assigned to the inner-node.
+         * tag */
+        if (info->flag == WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT)
+            g_assert(WEBKIT_DOM_IS_HTML_HTML_ELEMENT(node));
+        else if (info->flag == WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE)
+            g_assert(WEBKIT_DOM_IS_HTML_IMAGE_ELEMENT(node));
+        else if (info->flag == WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK) {
+            /* The hit test will give us the inner text node, we want
+             * the A tag */
+            WebKitDOMNode* parent = webkit_dom_node_get_parent_node(node);
+            g_assert(WEBKIT_DOM_IS_HTML_ANCHOR_ELEMENT(parent));
+        }
+
         g_object_unref(result);
         g_main_loop_quit(loop);

trunk/WebKit/gtk/webkit/webkithittestresult.cpp

@@ -23 +23 @@
 
 #include "GOwnPtr.h"
+#include "WebKitDOMNode.h"
 #include "webkitenumtypes.h"
 #include "webkitprivate.h"
@@ -44 +45 @@
     char* imageURI;
     char* mediaURI;
+    WebKitDOMNode* innerNode;
 };
 
@@ -54 +56 @@
     PROP_LINK_URI,
     PROP_IMAGE_URI,
-    PROP_MEDIA_URI
+    PROP_MEDIA_URI,
+    PROP_INNER_NODE
 };
 
@@ -87 +90 @@
         g_value_set_string(value, priv->mediaURI);
         break;
+    case PROP_INNER_NODE:
+        g_value_set_object(value, priv->innerNode);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyID, pspec);
@@ -112 +118 @@
         g_free (priv->mediaURI);
         priv->mediaURI = g_value_dup_string(value);
+        break;
+    case PROP_INNER_NODE:
+        priv->innerNode = static_cast<WebKitDOMNode*>(g_value_get_object(value));
         break;
     default:
@@ -185 +194 @@
                                                         static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY)));
 
+    /**
+     * WebKitHitTestResult:inner-node:
+     *
+     * The DOM node at the coordinates where the hit test
+     * happened. Keep in mind that the node might not be
+     * representative of the information given in the context
+     * property, since WebKit uses a series of heuristics to figure
+     * out that information. One common example is inner-node having
+     * the text node inside the anchor (<a>) tag; WebKit knows the
+     * whole context and will put WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK
+     * in the 'context' property, but the user might be confused by
+     * the lack of any link tag in 'inner-node'.
+     *
+     * Since: 1.3.2
+     */
+    g_object_class_install_property(objectClass, PROP_INNER_NODE,
+                                    g_param_spec_object("inner-node",
+                                                        _("Inner node"),
+                                                        _("The inner DOM node associated with the hit test result."),
+                                                        WEBKIT_TYPE_DOM_NODE,
+                                                        static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
+
     g_type_class_add_private(webHitTestResultClass, sizeof(WebKitHitTestResultPrivate));
 }

trunk/WebKit/gtk/webkit/webkitprivate.cpp

@@ -42 +42 @@
 #include "SecurityOrigin.h"
 #include "TextEncodingRegistry.h"
+#include "WebKitDOMBinding.h"
 #include "webkitnetworkresponse.h"
 #include "webkitsoupauthdialog.h"
@@ -141 +142 @@
     GOwnPtr<char> imageURI(0);
     GOwnPtr<char> mediaURI(0);
+    WebKitDOMNode* node = 0;
 
     if (!result.absoluteLinkURL().isEmpty()) {
@@ -163 +165 @@
         context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE;
 
+    if (result.innerNonSharedNode())
+        node = static_cast<WebKitDOMNode*>(kit(result.innerNonSharedNode()));
+
     return WEBKIT_HIT_TEST_RESULT(g_object_new(WEBKIT_TYPE_HIT_TEST_RESULT,
-                                           "link-uri", linkURI.get(),
-                                           "image-uri", imageURI.get(),
-                                           "media-uri", mediaURI.get(),
-                                           "context", context,
-                                           NULL));
+                                               "link-uri", linkURI.get(),
+                                               "image-uri", imageURI.get(),
+                                               "media-uri", mediaURI.get(),
+                                               "context", context,
+                                               "inner-node", node,
+                                               NULL));
 }