summaryrefslogtreecommitdiffstats
path: root/WebKit/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/gtk')
-rw-r--r--WebKit/gtk/ChangeLog75
-rw-r--r--WebKit/gtk/NEWS10
-rw-r--r--WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp2
-rw-r--r--WebKit/gtk/tests/testwebview.c5
-rw-r--r--WebKit/gtk/webkit/webkitprivate.h22
-rw-r--r--WebKit/gtk/webkit/webkitwebview.cpp157
6 files changed, 258 insertions, 13 deletions
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index a33506c..cddfac8 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,78 @@
+2010-07-12 Martin Robinson <mrobinson@igalia.com>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ [GTK] r63100 broke the testwebview test
+ https://bugs.webkit.org/show_bug.cgi?id=42114
+
+ * tests/testwebview.c: Disable a failing assertion in test_webkit_web_view_adjustments
+ until we can get to the bottom of the failure.
+
+2010-07-12 Xan Lopez <xlopez@igalia.com>
+
+ Reviewed by Gustavo Noronha.
+
+ Update for 1.3.3
+
+ * NEWS:
+
+2010-07-12 Xan Lopez <xlopez@igalia.com>
+
+ Reviewed by Gustavo Noronha.
+
+ Fix compilation with sealed GTK+.
+
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_drag_motion):
+ (webkit_web_view_drag_data_received):
+ (webkit_web_view_drag_drop):
+
+2010-07-11 Martin Robinson <mrobinson@igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] WebKitWebView should support drops
+ https://bugs.webkit.org/show_bug.cgi?id=39843
+
+ Add support for dropping content onto GTK+ WebViews.
+
+ * webkit/webkitprivate.h:
+ Add a DroppingContext struct to keep track of drop data while the drop is
+ in progress. Have WebKitWebView keep a map of GdkDragContexts to DroppingContexts.
+ * webkit/webkitwebview.cpp: Add necessary includes and globalPointForClientPoint helper.
+ (webkit_web_view_popup_menu_handler): Use globalPointForClientPoint helper.
+ (webkit_web_view_dispose): Properly clean up droppingContexts member.
+ (webkit_web_view_finalize): Delete droppingContext member.
+ (globalPointForClientPoint): Added.
+ (doDragLeaveLater): Added.
+ (webkit_web_view_drag_leave): Added.
+ (webkit_web_view_drag_motion): Added.
+ (webkit_web_view_drag_data_received): Added.
+ (webkit_web_view_drag_drop): Added.
+ (webkit_web_view_class_init): Connect new drop signal handlers to the widget definition.
+ (webkit_web_view_init): Set up the widget as a drop destination and initialize droppingContexts.
+
+2010-07-07 Sam Weinig <sam@webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ Patch for https://bugs.webkit.org/show_bug.cgi?id=41772
+ Add basic piping for BackForwardControllerClient.
+
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_init):
+
+2010-06-19 Ilya Tikhonovsky <loislo@chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ WebInspector: js function name was fixed.
+ dispatchMessageToFrontend -> dispatchMessageFromBackend.
+ https://bugs.webkit.org/show_bug.cgi?id=40675
+
+ * WebCoreSupport/InspectorClientGtk.cpp:
+ (WebKit::InspectorClient::sendMessageToFrontend):
+
2010-06-23 Martin Robinson <mrobinson@igalia.com>
Reviewed by Gustavo Noronha Silva.
diff --git a/WebKit/gtk/NEWS b/WebKit/gtk/NEWS
index eb6d8cc..b99e2a1 100644
--- a/WebKit/gtk/NEWS
+++ b/WebKit/gtk/NEWS
@@ -1,4 +1,14 @@
================
+WebKitGTK+ 1.3.3
+================
+
+What's new in WebKitGTK+ 1.3.3?
+
+ - Fixes to compile with latest GTK+ 2.90.x.
+ - Add support for dropping content in WebKitWebViews.
+ - Many other bugfixes.
+
+================
WebKitGTK+ 1.3.2
================
diff --git a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
index 4bc3c32..616834b 100644
--- a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
@@ -134,7 +134,7 @@ bool InspectorClient::sendMessageToFrontend(const String& message)
if (!scriptController)
return false;
- String dispatchToFrontend("WebInspector.dispatchMessageToFrontend(");
+ String dispatchToFrontend("WebInspector.dispatchMessageFromBackend(");
dispatchToFrontend += message;
dispatchToFrontend += ");";
scriptController->executeScript(dispatchToFrontend);
diff --git a/WebKit/gtk/tests/testwebview.c b/WebKit/gtk/tests/testwebview.c
index 36511d7..0bea643 100644
--- a/WebKit/gtk/tests/testwebview.c
+++ b/WebKit/gtk/tests/testwebview.c
@@ -266,7 +266,10 @@ static void do_test_webkit_web_view_adjustments(gboolean with_page_cache)
g_assert_cmpfloat(lower, ==, gtk_adjustment_get_lower(adjustment));
g_assert_cmpfloat(upper, ==, gtk_adjustment_get_upper(adjustment));
- g_assert_cmpfloat(gtk_adjustment_get_value(adjustment), ==, 100.0);
+ // This assert is temporarily disabled until we fix the following bug:
+ // https://bugs.webkit.org/show_bug.cgi?id=42114
+ // It should be re-enabled ASAP.
+ // g_assert_cmpfloat(gtk_adjustment_get_value(adjustment), ==, 100.0);
g_free(effective_uri);
g_free(second_uri);
diff --git a/WebKit/gtk/webkit/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h
index fa74abc..73f9fcc 100644
--- a/WebKit/gtk/webkit/webkitprivate.h
+++ b/WebKit/gtk/webkit/webkitprivate.h
@@ -48,21 +48,23 @@
#include "ArchiveResource.h"
#include "BackForwardList.h"
#include "DataObjectGtk.h"
-#include <enchant.h>
+#include "DragActions.h"
+#include "Frame.h"
#include "GOwnPtr.h"
#include "Geolocation.h"
#include "HistoryItem.h"
-#include "Settings.h"
-#include "Page.h"
-#include "Frame.h"
#include "InspectorClientGtk.h"
#include "IntPoint.h"
#include "FrameLoaderClient.h"
+#include "Page.h"
#include "ResourceHandle.h"
#include "ResourceRequest.h"
#include "ResourceResponse.h"
#include "WindowFeatures.h"
#include "SecurityOrigin.h"
+#include "Settings.h"
+#include <enchant.h>
+#include <wtf/OwnPtr.h>
#include <wtf/text/CString.h>
#include <atk/atk.h>
@@ -103,7 +105,16 @@ namespace WebKit {
WebKitHitTestResult* kit(const WebCore::HitTestResult&);
- WebKit::PasteboardHelperGtk* pasteboardHelperInstance();
+ PasteboardHelperGtk* pasteboardHelperInstance();
+
+ typedef struct DroppingContext_ {
+ WebKitWebView* webView;
+ GdkDragContext* gdkContext;
+ RefPtr<WebCore::DataObjectGtk> dataObject;
+ WebCore::IntPoint lastMotionPosition;
+ int pendingDataRequests;
+ bool dropHappened;
+ } DroppingContext;
}
extern "C" {
@@ -159,6 +170,7 @@ extern "C" {
guint32 previousClickTime;
HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> >* draggingDataObjects;
+ HashMap<GdkDragContext*, WebKit::DroppingContext*>* droppingContexts;
};
#define WEBKIT_WEB_FRAME_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_FRAME, WebKitWebFramePrivate))
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 62997c5..0010a77 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -7,7 +7,7 @@
* Copyright (C) 2008 Gustavo Noronha Silva <gns@gnome.org>
* Copyright (C) 2008 Nuanti Ltd.
* Copyright (C) 2008, 2009, 2010 Collabora Ltd.
- * Copyright (C) 2009 Igalia S.L.
+ * Copyright (C) 2009, 2010 Igalia S.L.
* Copyright (C) 2009 Movial Creative Technologies Inc.
* Copyright (C) 2009 Bobby Powers
*
@@ -52,7 +52,10 @@
#include "Cursor.h"
#include "Document.h"
#include "DocumentLoader.h"
+#include "DragActions.h"
#include "DragClientGtk.h"
+#include "DragController.h"
+#include "DragData.h"
#include "EditorClientGtk.h"
#include "Editor.h"
#include "EventHandler.h"
@@ -123,6 +126,7 @@
static const double defaultDPI = 96.0;
static WebKitCacheModel cacheModel;
+static IntPoint globalPointForClientPoint(GdkWindow* window, const IntPoint& clientPoint);
using namespace WebKit;
using namespace WebCore;
@@ -370,9 +374,6 @@ static gboolean webkit_web_view_popup_menu_handler(GtkWidget* widget)
location = IntPoint(rightAligned ? firstRect.right() : firstRect.x(), firstRect.bottom());
}
- int x, y;
- gdk_window_get_origin(gtk_widget_get_window(GTK_WIDGET(view->hostWindow()->platformPageClient())), &x, &y);
-
// FIXME: The IntSize(0, -1) is a hack to get the hit-testing to result in the selected element.
// Ideally we'd have the position of a context menu event be separate from its target node.
location = view->contentsToWindow(location) + IntSize(0, -1);
@@ -384,7 +385,7 @@ static gboolean webkit_web_view_popup_menu_handler(GtkWidget* widget)
location.setX(contextMenuMargin);
else if (location.x() > view->width())
location.setX(view->width() - contextMenuMargin);
- IntPoint global = location + IntSize(x, y);
+ IntPoint global(globalPointForClientPoint(gtk_widget_get_window(widget), location));
PlatformMouseEvent event(location, global, RightButton, MouseEventPressed, 0, false, false, false, false, gtk_get_current_event_time());
@@ -1197,6 +1198,10 @@ static void webkit_web_view_dispose(GObject* object)
}
priv->draggingDataObjects->clear();
+ HashMap<GdkDragContext*, DroppingContext*>::iterator endDroppingContexts = priv->droppingContexts->end();
+ for (HashMap<GdkDragContext*, DroppingContext*>::iterator iter = priv->droppingContexts->begin(); iter != endDroppingContexts; ++iter)
+ delete (iter->second);
+ priv->droppingContexts->clear();
G_OBJECT_CLASS(webkit_web_view_parent_class)->dispose(object);
}
@@ -1214,6 +1219,7 @@ static void webkit_web_view_finalize(GObject* object)
delete priv->previousClickPoint;
delete priv->draggingDataObjects;
+ delete priv->droppingContexts;
G_OBJECT_CLASS(webkit_web_view_parent_class)->finalize(object);
}
@@ -1309,6 +1315,14 @@ static void webkit_web_view_screen_changed(GtkWidget* widget, GdkScreen* previou
settings->setMinimumLogicalFontSize(minimumLogicalFontSize / 72.0 * DPI);
}
+static IntPoint globalPointForClientPoint(GdkWindow* window, const IntPoint& clientPoint)
+{
+ int x, y;
+ gdk_window_get_origin(window, &x, &y);
+ return clientPoint + IntSize(x, y);
+}
+
+
static void webkit_web_view_drag_end(GtkWidget* widget, GdkDragContext* context)
{
WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
@@ -1360,6 +1374,130 @@ static void webkit_web_view_drag_data_get(GtkWidget* widget, GdkDragContext* con
pasteboardHelperInstance()->fillSelectionData(selectionData, info, priv->draggingDataObjects->get(context).get());
}
+static gboolean doDragLeaveLater(DroppingContext* context)
+{
+ WebKitWebView* webView = context->webView;
+ WebKitWebViewPrivate* priv = webView->priv;
+
+ if (!priv->droppingContexts->contains(context->gdkContext))
+ return FALSE;
+
+ // If the view doesn't know about the drag yet (there are still pending data)
+ // requests, don't update it with information about the drag.
+ if (context->pendingDataRequests)
+ return FALSE;
+
+ // Don't call dragExited if we have just received a drag-drop signal. This
+ // happens in the case of a successful drop onto the view.
+ if (!context->dropHappened) {
+ const IntPoint& position = context->lastMotionPosition;
+ DragData dragData(context->dataObject.get(), position, globalPointForClientPoint(gtk_widget_get_window(GTK_WIDGET(webView)), position), DragOperationNone);
+ core(webView)->dragController()->dragExited(&dragData);
+ }
+
+ core(webView)->dragController()->dragEnded();
+ priv->droppingContexts->remove(context->gdkContext);
+ delete context;
+ return FALSE;
+}
+
+static void webkit_web_view_drag_leave(GtkWidget* widget, GdkDragContext* context, guint time)
+{
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+ WebKitWebViewPrivate* priv = webView->priv;
+
+ if (!priv->droppingContexts->contains(context))
+ return;
+
+ // During a drop GTK+ will fire a drag-leave signal right before firing
+ // the drag-drop signal. We want the actions for drag-leave to happen after
+ // those for drag-drop, so schedule them to happen asynchronously here.
+ g_timeout_add(0, reinterpret_cast<GSourceFunc>(doDragLeaveLater), priv->droppingContexts->get(context));
+}
+
+static gboolean webkit_web_view_drag_motion(GtkWidget* widget, GdkDragContext* context, gint x, gint y, guint time)
+{
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+ WebKitWebViewPrivate* priv = webView->priv;
+
+ DroppingContext* droppingContext = 0;
+ IntPoint position = IntPoint(x, y);
+ if (!priv->droppingContexts->contains(context)) {
+ droppingContext = new DroppingContext;
+ droppingContext->webView = webView;
+ droppingContext->gdkContext = context;
+ droppingContext->dataObject = WebCore::DataObjectGtk::create();
+ droppingContext->dropHappened = false;
+ droppingContext->lastMotionPosition = position;
+ priv->droppingContexts->set(context, droppingContext);
+
+ Vector<GdkAtom> acceptableTargets(pasteboardHelperInstance()->dropAtomsForContext(widget, context));
+ droppingContext->pendingDataRequests = acceptableTargets.size();
+ for (size_t i = 0; i < acceptableTargets.size(); i++)
+ gtk_drag_get_data(widget, context, acceptableTargets.at(i), time);
+ } else {
+ droppingContext = priv->droppingContexts->get(context);
+ droppingContext->lastMotionPosition = position;
+ }
+
+ // Don't send any drag information to WebCore until we've retrieved all
+ // the data for this drag operation. Otherwise we'd have to block to wait
+ // for the drag's data.
+ ASSERT(droppingContext);
+ if (droppingContext->pendingDataRequests > 0)
+ return TRUE;
+
+ DragData dragData(droppingContext->dataObject.get(), position, globalPointForClientPoint(gtk_widget_get_window(widget), position), gdkDragActionToDragOperation(gdk_drag_context_get_actions(context)));
+ DragOperation operation = core(webView)->dragController()->dragUpdated(&dragData);
+ gdk_drag_status(context, dragOperationToSingleGdkDragAction(operation), time);
+
+ return TRUE;
+}
+
+static void webkit_web_view_drag_data_received(GtkWidget* widget, GdkDragContext* context, gint x, gint y, GtkSelectionData* selectionData, guint info, guint time)
+{
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+ WebKitWebViewPrivate* priv = webView->priv;
+
+ if (!priv->droppingContexts->contains(context))
+ return;
+
+ DroppingContext* droppingContext = priv->droppingContexts->get(context);
+ droppingContext->pendingDataRequests--;
+ pasteboardHelperInstance()->fillDataObjectFromDropData(selectionData, info, droppingContext->dataObject.get());
+
+ if (droppingContext->pendingDataRequests)
+ return;
+
+ // The coordinates passed to drag-data-received signal are sometimes
+ // inaccurate in DRT, so use the coordinates of the last motion event.
+ const IntPoint& position = droppingContext->lastMotionPosition;
+
+ // If there are no more pending requests, start sending dragging data to WebCore.
+ DragData dragData(droppingContext->dataObject.get(), position, globalPointForClientPoint(gtk_widget_get_window(widget), position), gdkDragActionToDragOperation(gdk_drag_context_get_actions(context)));
+ DragOperation operation = core(webView)->dragController()->dragEntered(&dragData);
+ gdk_drag_status(context, dragOperationToSingleGdkDragAction(operation), time);
+}
+
+static gboolean webkit_web_view_drag_drop(GtkWidget* widget, GdkDragContext* context, gint x, gint y, guint time)
+{
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+ WebKitWebViewPrivate* priv = webView->priv;
+
+ if (!priv->droppingContexts->contains(context))
+ return FALSE;
+
+ DroppingContext* droppingContext = priv->droppingContexts->get(context);
+ droppingContext->dropHappened = true;
+
+ IntPoint position(x, y);
+ DragData dragData(droppingContext->dataObject.get(), position, globalPointForClientPoint(gtk_widget_get_window(widget), position), gdkDragActionToDragOperation(gdk_drag_context_get_actions(context)));
+ core(webView)->dragController()->performDrag(&dragData);
+
+ gtk_drag_finish(context, TRUE, FALSE, time);
+ return TRUE;
+}
+
#if GTK_CHECK_VERSION(2, 12, 0)
static gboolean webkit_web_view_query_tooltip(GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip)
{
@@ -2356,6 +2494,10 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
widgetClass->screen_changed = webkit_web_view_screen_changed;
widgetClass->drag_end = webkit_web_view_drag_end;
widgetClass->drag_data_get = webkit_web_view_drag_data_get;
+ widgetClass->drag_motion = webkit_web_view_drag_motion;
+ widgetClass->drag_leave = webkit_web_view_drag_leave;
+ widgetClass->drag_drop = webkit_web_view_drag_drop;
+ widgetClass->drag_data_received = webkit_web_view_drag_data_received;
#if GTK_CHECK_VERSION(2, 12, 0)
widgetClass->query_tooltip = webkit_web_view_query_tooltip;
#endif
@@ -2900,7 +3042,7 @@ static void webkit_web_view_init(WebKitWebView* webView)
priv->imContext = gtk_im_multicontext_new();
WebKit::InspectorClient* inspectorClient = new WebKit::InspectorClient(webView);
- priv->corePage = new Page(new WebKit::ChromeClient(webView), new WebKit::ContextMenuClient(webView), new WebKit::EditorClient(webView), new WebKit::DragClient(webView), inspectorClient, 0, 0, 0);
+ priv->corePage = new Page(new WebKit::ChromeClient(webView), new WebKit::ContextMenuClient(webView), new WebKit::EditorClient(webView), new WebKit::DragClient(webView), inspectorClient, 0, 0, 0, 0);
// We also add a simple wrapper class to provide the public
// interface for the Web Inspector.
@@ -2937,6 +3079,9 @@ static void webkit_web_view_init(WebKitWebView* webView)
priv->previousClickTime = 0;
priv->draggingDataObjects = new HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> >();
+ priv->droppingContexts = new HashMap<GdkDragContext*, DroppingContext*>();
+ gtk_drag_dest_set(GTK_WIDGET(webView), static_cast<GtkDestDefaults>(0), 0, 0, static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK | GDK_ACTION_PRIVATE));
+ gtk_drag_dest_set_target_list(GTK_WIDGET(webView), pasteboardHelperInstance()->targetList());
}
GtkWidget* webkit_web_view_new(void)
generated by cgit v1.1 at 2025-08-17 11:19:58 +0000