From 6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Tue, 18 Sep 2012 15:53:33 +0200
Subject: Imported WebKit commit c7503cef7ecb236730d1309676ab9fc723fd061d
 (http://svn.webkit.org/repository/webkit/trunk@128886)

New snapshot with various build fixes
---
 Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp')

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
index f5bd2ddcc..0482b347e 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
@@ -84,6 +84,7 @@ struct _WebKitWebViewBasePrivate {
     GRefPtr<GtkIMContext> imContext;
     GtkClickCounter clickCounter;
     CString tooltipText;
+    IntRect tooltipArea;
     GtkDragAndDropHelper dragAndDropHelper;
     DragIcon dragIcon;
     IntSize resizerSize;
@@ -502,9 +503,13 @@ static gboolean webkitWebViewBaseQueryTooltip(GtkWidget* widget, gint x, gint y,
     if (priv->tooltipText.length() <= 0)
         return FALSE;
 
-    // TODO: set the tip area when WKPageMouseDidMoveOverElementCallback
-    // receives a hit test result.
+    if (!priv->tooltipArea.isEmpty()) {
+        GdkRectangle area = priv->tooltipArea;
+        gtk_tooltip_set_tip_area(tooltip, &area);
+    } else
+        gtk_tooltip_set_tip_area(tooltip, 0);
     gtk_tooltip_set_text(tooltip, priv->tooltipText.data());
+
     return TRUE;
 }
 
@@ -691,6 +696,11 @@ void webkitWebViewBaseSetTooltipText(WebKitWebViewBase* webViewBase, const char*
     gtk_widget_trigger_tooltip_query(GTK_WIDGET(webViewBase));
 }
 
+void webkitWebViewBaseSetTooltipArea(WebKitWebViewBase* webViewBase, const IntRect& tooltipArea)
+{
+    webViewBase->priv->tooltipArea = tooltipArea;
+}
+
 void webkitWebViewBaseStartDrag(WebKitWebViewBase* webViewBase, const DragData& dragData, PassRefPtr<ShareableBitmap> dragImage)
 {
     WebKitWebViewBasePrivate* priv = webViewBase->priv;
-- 
cgit v1.2.1