Modified: trunk/Source/WebKit2/ChangeLog (172340 => 172341)
--- trunk/Source/WebKit2/ChangeLog 2014-08-08 08:17:01 UTC (rev 172340)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-08 09:31:41 UTC (rev 172341)
@@ -1,3 +1,17 @@
+2014-08-08 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Do not use GtkWindow:resize-grip-visible with recent GTK+ versions
+ https://bugs.webkit.org/show_bug.cgi?id=135699
+
+ Reviewed by Philippe Normand.
+
+ Resize grips support have been removed from GTK+ since 3.13.4, the
+ API has been deprecated and does nothing.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseSetToplevelOnScreenWindow):
+ (resizeWebKitWebViewBaseFromAllocation):
+
2014-08-07 Tim Horton <[email protected]>
[Services with UI] Action menu does not appear if selection includes both text and an image
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (172340 => 172341)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-08-08 08:17:01 UTC (rev 172340)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-08-08 09:31:41 UTC (rev 172341)
@@ -103,7 +103,9 @@
IntRect tooltipArea;
GtkDragAndDropHelper dragAndDropHelper;
DragIcon dragIcon;
+#if !GTK_CHECK_VERSION(3, 13, 4)
IntSize resizerSize;
+#endif
GRefPtr<AtkObject> accessible;
bool needsResizeOnMap;
GtkWidget* authenticationDialog;
@@ -116,7 +118,9 @@
GtkTouchContextHelper touchContext;
GtkWindow* toplevelOnScreenWindow;
+#if !GTK_CHECK_VERSION(3, 13, 4)
unsigned long toplevelResizeGripVisibilityID;
+#endif
unsigned long toplevelFocusInEventID;
unsigned long toplevelFocusOutEventID;
unsigned long toplevelVisibilityEventID;
@@ -141,6 +145,7 @@
WEBKIT_DEFINE_TYPE(WebKitWebViewBase, webkit_web_view_base, GTK_TYPE_CONTAINER)
+#if !GTK_CHECK_VERSION(3, 13, 4)
static void webkitWebViewBaseNotifyResizerSize(WebKitWebViewBase* webViewBase)
{
WebKitWebViewBasePrivate* priv = webViewBase->priv;
@@ -170,6 +175,7 @@
{
webkitWebViewBaseNotifyResizerSize(webViewBase);
}
+#endif
static gboolean toplevelWindowFocusInEvent(GtkWidget*, GdkEventFocus*, WebKitWebViewBase* webViewBase)
{
@@ -211,10 +217,12 @@
if (priv->toplevelOnScreenWindow == window)
return;
+#if !GTK_CHECK_VERSION(3, 13, 4)
if (priv->toplevelResizeGripVisibilityID) {
g_signal_handler_disconnect(priv->toplevelOnScreenWindow, priv->toplevelResizeGripVisibilityID);
priv->toplevelResizeGripVisibilityID = 0;
}
+#endif
if (priv->toplevelFocusInEventID) {
g_signal_handler_disconnect(priv->toplevelOnScreenWindow, priv->toplevelFocusInEventID);
priv->toplevelFocusInEventID = 0;
@@ -233,11 +241,13 @@
if (!priv->toplevelOnScreenWindow)
return;
+#if !GTK_CHECK_VERSION(3, 13, 4)
webkitWebViewBaseNotifyResizerSize(webViewBase);
priv->toplevelResizeGripVisibilityID =
g_signal_connect(priv->toplevelOnScreenWindow, "notify::resize-grip-visible",
G_CALLBACK(toplevelWindowResizeGripVisibilityChanged), webViewBase);
+#endif
priv->toplevelFocusInEventID =
g_signal_connect(priv->toplevelOnScreenWindow, "focus-in-event",
G_CALLBACK(toplevelWindowFocusInEvent), webViewBase);
@@ -547,7 +557,9 @@
if (priv->pageProxy->drawingArea())
priv->pageProxy->drawingArea()->setSize(viewRect.size(), IntSize(), IntSize());
+#if !GTK_CHECK_VERSION(3, 13, 4)
webkitWebViewBaseNotifyResizerSize(webViewBase);
+#endif
}
static void webkitWebViewBaseSizeAllocate(GtkWidget* widget, GtkAllocation* allocation)
