<!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>[246398] trunk/Source</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/246398">246398</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2019-06-13 04:38:45 -0700 (Thu, 13 Jun 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK] gdk_display_get_device_manager and gdk_screen_get_width/height are deprecated
https://bugs.webkit.org/show_bug.cgi?id=198822

Patch by Ludovico de Nittis <ludovico.denittis@collabora.com> on 2019-06-13
Reviewed by Carlos Garcia Campos.

GdkSeat and GdkRectangle should be used, respectively.

Source/WebCore:

No behaviour changes.

* platform/gtk/GtkVersioning.c:
(getDefaultGDKPointerDevice):
(getScreenWorkArea):

Source/WebKit:

* UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp:
(WebKit::doMouseEvent):
(WebKit::doMotionEvent):
(WebKit::doKeyStrokeEvent):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkGtkVersioningc">trunk/Source/WebCore/platform/gtk/GtkVersioning.c</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessAutomationgtkWebAutomationSessionGtkcpp">trunk/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (246397 => 246398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-06-13 06:28:01 UTC (rev 246397)
+++ trunk/Source/WebCore/ChangeLog      2019-06-13 11:38:45 UTC (rev 246398)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2019-06-13  Ludovico de Nittis  <ludovico.denittis@collabora.com>
+
+        [GTK] gdk_display_get_device_manager and gdk_screen_get_width/height are deprecated
+        https://bugs.webkit.org/show_bug.cgi?id=198822
+
+        Reviewed by Carlos Garcia Campos.
+
+        GdkSeat and GdkRectangle should be used, respectively.
+
+        No behaviour changes.
+
+        * platform/gtk/GtkVersioning.c:
+        (getDefaultGDKPointerDevice):
+        (getScreenWorkArea):
+
</ins><span class="cx"> 2019-06-12  Antoine Quint  <graouts@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [WHLSL] Hook up compute
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkGtkVersioningc"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/GtkVersioning.c (246397 => 246398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GtkVersioning.c        2019-06-13 06:28:01 UTC (rev 246397)
+++ trunk/Source/WebCore/platform/gtk/GtkVersioning.c   2019-06-13 11:38:45 UTC (rev 246398)
</span><span class="lines">@@ -30,7 +30,9 @@
</span><span class="cx"> 
</span><span class="cx"> GdkDevice *getDefaultGDKPointerDevice(GdkWindow* window)
</span><span class="cx"> {
</span><del>-#ifndef GTK_API_VERSION_2
</del><ins>+#if GTK_CHECK_VERSION(3, 20, 0)
+    return gdk_seat_get_pointer(gdk_display_get_default_seat(gdk_window_get_display(window)));
+#elif !defined(GTK_API_VERSION_2)
</ins><span class="cx">     GdkDeviceManager *manager =  gdk_display_get_device_manager(gdk_window_get_display(window));
</span><span class="cx">     return gdk_device_manager_get_client_pointer(manager);
</span><span class="cx"> #else
</span><span class="lines">@@ -233,10 +235,20 @@
</span><span class="cx">     Atom workArea = XInternAtom(display, "_NET_WORKAREA", True);
</span><span class="cx"> 
</span><span class="cx">     /* Defaults in case of error. */
</span><ins>+#if GTK_CHECK_VERSION(3, 22, 0)
+    GdkRectangle geom;
+    GdkMonitor *monitor = gdk_display_get_primary_monitor(display);
+    gdk_monitor_get_geometry(monitor, &geom);
+    area->x = geom.x;
+    area->y = geom.y;
+    area->width = geom.width;
+    area->height = geom.height;
+#else
</ins><span class="cx">     area->x = 0;
</span><span class="cx">     area->y = 0;
</span><span class="cx">     area->width = gdk_screen_get_width(screen);
</span><span class="cx">     area->height = gdk_screen_get_height(screen);
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx">     if (workArea == None)
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (246397 => 246398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-06-13 06:28:01 UTC (rev 246397)
+++ trunk/Source/WebKit/ChangeLog       2019-06-13 11:38:45 UTC (rev 246398)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2019-06-13  Ludovico de Nittis  <ludovico.denittis@collabora.com>
+
+        [GTK] gdk_display_get_device_manager and gdk_screen_get_width/height are deprecated
+        https://bugs.webkit.org/show_bug.cgi?id=198822
+
+        Reviewed by Carlos Garcia Campos.
+
+        GdkSeat and GdkRectangle should be used, respectively.
+
+        * UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp:
+        (WebKit::doMouseEvent):
+        (WebKit::doMotionEvent):
+        (WebKit::doKeyStrokeEvent):
+
</ins><span class="cx"> 2019-06-12  Antoine Quint  <graouts@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Show the web page URL when sharing an AR model
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAutomationgtkWebAutomationSessionGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp (246397 => 246398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp 2019-06-13 06:28:01 UTC (rev 246397)
+++ trunk/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp    2019-06-13 11:38:45 UTC (rev 246398)
</span><span class="lines">@@ -75,7 +75,11 @@
</span><span class="cx">     event->button.axes = 0;
</span><span class="cx">     event->button.state = state;
</span><span class="cx">     event->button.button = button;
</span><ins>+#if GTK_CHECK_VERSION(3, 20, 0)
+    event->button.device = gdk_seat_get_pointer(gdk_display_get_default_seat(gtk_widget_get_display(widget)));
+#else
</ins><span class="cx">     event->button.device = gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gtk_widget_get_display(widget)));
</span><ins>+#endif
</ins><span class="cx">     int xRoot, yRoot;
</span><span class="cx">     gdk_window_get_root_coords(gtk_widget_get_window(widget), location.x(), location.y(), &xRoot, &yRoot);
</span><span class="cx">     event->button.x_root = xRoot;
</span><span class="lines">@@ -93,7 +97,11 @@
</span><span class="cx">     event->motion.y = location.y();
</span><span class="cx">     event->motion.axes = 0;
</span><span class="cx">     event->motion.state = state;
</span><ins>+#if GTK_CHECK_VERSION(3, 20, 0)
+    event->motion.device = gdk_seat_get_pointer(gdk_display_get_default_seat(gtk_widget_get_display(widget)));
+#else
</ins><span class="cx">     event->motion.device = gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gtk_widget_get_display(widget)));
</span><ins>+#endif
</ins><span class="cx">     int xRoot, yRoot;
</span><span class="cx">     gdk_window_get_root_coords(gtk_widget_get_window(widget), location.x(), location.y(), &xRoot, &yRoot);
</span><span class="cx">     event->motion.x_root = xRoot;
</span><span class="lines">@@ -142,7 +150,12 @@
</span><span class="cx">     event->key.time = GDK_CURRENT_TIME;
</span><span class="cx">     event->key.window = gtk_widget_get_window(widget);
</span><span class="cx">     g_object_ref(event->key.window);
</span><ins>+
+#if GTK_CHECK_VERSION(3, 20, 0)
+    gdk_event_set_device(event.get(), gdk_seat_get_pointer(gdk_display_get_default_seat(gtk_widget_get_display(widget))));
+#else
</ins><span class="cx">     gdk_event_set_device(event.get(), gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gtk_widget_get_display(widget))));
</span><ins>+#endif
</ins><span class="cx">     event->key.state = state;
</span><span class="cx"> 
</span><span class="cx">     // When synthesizing an event, an invalid hardware_keycode value can cause it to be badly processed by GTK+.
</span><span class="lines">@@ -332,4 +345,3 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span><del>-
</del></span></pre>
</div>
</div>

</body>
</html>