<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[172341] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/172341">172341</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-08 02:31:41 -0700 (Fri, 08 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (172340 => 172341)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-08-08 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [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):
+
</ins><span class="cx"> 2014-08-07 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [Services with UI] Action menu does not appear if selection includes both text and an image
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (172340 => 172341)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -103,7 +103,9 @@
</span><span class="cx"> IntRect tooltipArea;
</span><span class="cx"> GtkDragAndDropHelper dragAndDropHelper;
</span><span class="cx"> DragIcon dragIcon;
</span><ins>+#if !GTK_CHECK_VERSION(3, 13, 4)
</ins><span class="cx"> IntSize resizerSize;
</span><ins>+#endif
</ins><span class="cx"> GRefPtr<AtkObject> accessible;
</span><span class="cx"> bool needsResizeOnMap;
</span><span class="cx"> GtkWidget* authenticationDialog;
</span><span class="lines">@@ -116,7 +118,9 @@
</span><span class="cx"> GtkTouchContextHelper touchContext;
</span><span class="cx">
</span><span class="cx"> GtkWindow* toplevelOnScreenWindow;
</span><ins>+#if !GTK_CHECK_VERSION(3, 13, 4)
</ins><span class="cx"> unsigned long toplevelResizeGripVisibilityID;
</span><ins>+#endif
</ins><span class="cx"> unsigned long toplevelFocusInEventID;
</span><span class="cx"> unsigned long toplevelFocusOutEventID;
</span><span class="cx"> unsigned long toplevelVisibilityEventID;
</span><span class="lines">@@ -141,6 +145,7 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_DEFINE_TYPE(WebKitWebViewBase, webkit_web_view_base, GTK_TYPE_CONTAINER)
</span><span class="cx">
</span><ins>+#if !GTK_CHECK_VERSION(3, 13, 4)
</ins><span class="cx"> static void webkitWebViewBaseNotifyResizerSize(WebKitWebViewBase* webViewBase)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebViewBasePrivate* priv = webViewBase->priv;
</span><span class="lines">@@ -170,6 +175,7 @@
</span><span class="cx"> {
</span><span class="cx"> webkitWebViewBaseNotifyResizerSize(webViewBase);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> static gboolean toplevelWindowFocusInEvent(GtkWidget*, GdkEventFocus*, WebKitWebViewBase* webViewBase)
</span><span class="cx"> {
</span><span class="lines">@@ -211,10 +217,12 @@
</span><span class="cx"> if (priv->toplevelOnScreenWindow == window)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+#if !GTK_CHECK_VERSION(3, 13, 4)
</ins><span class="cx"> if (priv->toplevelResizeGripVisibilityID) {
</span><span class="cx"> g_signal_handler_disconnect(priv->toplevelOnScreenWindow, priv->toplevelResizeGripVisibilityID);
</span><span class="cx"> priv->toplevelResizeGripVisibilityID = 0;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> if (priv->toplevelFocusInEventID) {
</span><span class="cx"> g_signal_handler_disconnect(priv->toplevelOnScreenWindow, priv->toplevelFocusInEventID);
</span><span class="cx"> priv->toplevelFocusInEventID = 0;
</span><span class="lines">@@ -233,11 +241,13 @@
</span><span class="cx"> if (!priv->toplevelOnScreenWindow)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+#if !GTK_CHECK_VERSION(3, 13, 4)
</ins><span class="cx"> webkitWebViewBaseNotifyResizerSize(webViewBase);
</span><span class="cx">
</span><span class="cx"> priv->toplevelResizeGripVisibilityID =
</span><span class="cx"> g_signal_connect(priv->toplevelOnScreenWindow, "notify::resize-grip-visible",
</span><span class="cx"> G_CALLBACK(toplevelWindowResizeGripVisibilityChanged), webViewBase);
</span><ins>+#endif
</ins><span class="cx"> priv->toplevelFocusInEventID =
</span><span class="cx"> g_signal_connect(priv->toplevelOnScreenWindow, "focus-in-event",
</span><span class="cx"> G_CALLBACK(toplevelWindowFocusInEvent), webViewBase);
</span><span class="lines">@@ -547,7 +557,9 @@
</span><span class="cx"> if (priv->pageProxy->drawingArea())
</span><span class="cx"> priv->pageProxy->drawingArea()->setSize(viewRect.size(), IntSize(), IntSize());
</span><span class="cx">
</span><ins>+#if !GTK_CHECK_VERSION(3, 13, 4)
</ins><span class="cx"> webkitWebViewBaseNotifyResizerSize(webViewBase);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void webkitWebViewBaseSizeAllocate(GtkWidget* widget, GtkAllocation* allocation)
</span></span></pre>
</div>
</div>
</body>
</html>