Changeset 48505 in webkit

Timestamp:

Sep 18, 2009 6:53:10 AM (15 years ago)

Author:

xan@webkit.org

Message:

2009-09-14 Xan Lopez <​xlopez@igalia.com>

Reviewed by Gustavo Noronha and Jan Alonzo.

[GTK] context menu overriding API is very limited
​https://bugs.webkit.org/show_bug.cgi?id=27546

Add WebKitHitTestResult to the build.

• GNUmakefile.am:

WebKit/gtk:

2009-09-18 Xan Lopez <​xlopez@igalia.com>

Reviewed by Gustavo Noronha and Jan Alonzo.

[GTK] context menu overriding API is very limited
​https://bugs.webkit.org/show_bug.cgi?id=27546

Add WebKitHitTestResult, a wrapper over HitTestResult. It contains
context information about a point in the web page.

• webkit/webkit.h:
• webkit/webkitdefines.h:
• webkit/webkithittestresult.cpp: Added. (webkit_hit_test_result_finalize): (webkit_hit_test_result_get_property): (webkit_hit_test_result_set_property): (webkit_hit_test_result_class_init): (webkit_hit_test_result_init):
• webkit/webkithittestresult.h: Added.
• webkit/webkitprivate.cpp: (WebKit::kit):
• webkit/webkitprivate.h:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (2 diffs)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/webkit/webkit.h (modified) (1 diff)
• WebKit/gtk/webkit/webkitdefines.h (modified) (1 diff)
• WebKit/gtk/webkit/webkithittestresult.cpp (added)
• WebKit/gtk/webkit/webkithittestresult.h (added)
• WebKit/gtk/webkit/webkitprivate.cpp (modified) (2 diffs)
• WebKit/gtk/webkit/webkitprivate.h (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2009-09-14  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Gustavo Noronha and Jan Alonzo.
+
+        [GTK] context menu overriding API is very limited
+        https://bugs.webkit.org/show_bug.cgi?id=27546
+
+        Add WebKitHitTestResult to the build.
+
+        * GNUmakefile.am:
+
 2009-09-10  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 

trunk/GNUmakefile.am

@@ -319 +319 @@
         $(srcdir)/WebKit/gtk/webkit/webkitdownload.h \
         $(srcdir)/WebKit/gtk/webkit/webkiterror.h \
+        $(srcdir)/WebKit/gtk/webkit/webkithittestresult.h \
         $(srcdir)/WebKit/gtk/webkit/webkitnetworkrequest.h \
         $(srcdir)/WebKit/gtk/webkit/webkitnetworkresponse.h \
@@ -363 +364 @@
         WebKit/gtk/webkit/webkitdownload.cpp \
         WebKit/gtk/webkit/webkiterror.cpp \
+        WebKit/gtk/webkit/webkithittestresult.cpp \
         WebKit/gtk/webkit/webkitnetworkrequest.cpp \
         WebKit/gtk/webkit/webkitnetworkresponse.cpp \

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2009-09-18  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Gustavo Noronha and Jan Alonzo.
+
+        [GTK] context menu overriding API is very limited
+        https://bugs.webkit.org/show_bug.cgi?id=27546
+
+        Add WebKitHitTestResult, a wrapper over HitTestResult. It contains
+        context information about a point in the web page.
+
+        * webkit/webkit.h:
+        * webkit/webkitdefines.h:
+        * webkit/webkithittestresult.cpp: Added.
+        (webkit_hit_test_result_finalize):
+        (webkit_hit_test_result_get_property):
+        (webkit_hit_test_result_set_property):
+        (webkit_hit_test_result_class_init):
+        (webkit_hit_test_result_init):
+        * webkit/webkithittestresult.h: Added.
+        * webkit/webkitprivate.cpp:
+        (WebKit::kit):
+        * webkit/webkitprivate.h:
+
 2009-09-14  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 

trunk/WebKit/gtk/webkit/webkit.h

@@ -25 +25 @@
 #include <webkit/webkitdefines.h>
 #include <webkit/webkitdownload.h>
+#include <webkit/webkithittestresult.h>
 #include <webkit/webkitnetworkrequest.h>
 #include <webkit/webkitnetworkresponse.h>

trunk/WebKit/gtk/webkit/webkitdefines.h

@@ -87 +87 @@
 typedef struct _WebKitSecurityOriginClass WebKitSecurityOriginClass;
 
+typedef struct _WebKitHitTestResult WebKitHitTestResult;
+typedef struct _WebKitHitTestResultClass WebKitHitTestResultClass;
+
 G_END_DECLS
 

trunk/WebKit/gtk/webkit/webkitprivate.cpp

@@ -28 +28 @@
 #include "FrameLoader.h"
 #include "FrameLoaderClientGtk.h"
+#include "HitTestResult.h"
 #include <libintl.h>
 #include "Logging.h"
@@ -117 +118 @@
 }
 
+WebKitHitTestResult* kit(const WebCore::HitTestResult& result)
+{
+    guint context = WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT;
+    GOwnPtr<char> linkURI(0);
+    GOwnPtr<char> imageURI(0);
+    GOwnPtr<char> mediaURI(0);
+
+    if (!result.absoluteLinkURL().isEmpty()) {
+        context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK;
+        linkURI.set(g_strdup(result.absoluteLinkURL().string().utf8().data()));
+    }
+
+    if (!result.absoluteImageURL().isEmpty()) {
+        context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE;
+        imageURI.set(g_strdup(result.absoluteImageURL().string().utf8().data()));
+    }
+
+    if (!result.absoluteMediaURL().isEmpty()) {
+        context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA;
+        mediaURI.set(g_strdup(result.absoluteMediaURL().string().utf8().data()));
+    }
+
+    if (result.isSelected())
+        context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION;
+
+    if (result.isContentEditable())
+        context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE;
+
+    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));
+}
+
 } /** end namespace WebKit */
 

trunk/WebKit/gtk/webkit/webkitprivate.h

@@ -31 +31 @@
 #include <webkit/webkitdefines.h>
 #include <webkit/webkitdownload.h>
+#include <webkit/webkithittestresult.h>
 #include <webkit/webkitnetworkrequest.h>
 #include <webkit/webkitwebview.h>
@@ -95 +96 @@
     WebKitSecurityOrigin* kit(WebCore::SecurityOrigin*);
     WebCore::SecurityOrigin* core(WebKitSecurityOrigin*);
+
+    WebKitHitTestResult* kit(const WebCore::HitTestResult&);
 }