<!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>[260123] trunk/Source/WebCore</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/260123">260123</a></dd>
<dt>Author</dt> <dd>aperez@igalia.com</dd>
<dt>Date</dt> <dd>2020-04-15 06:08:25 -0700 (Wed, 15 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK4] Adapt to cursor API changes
https://bugs.webkit.org/show_bug.cgi?id=210453

Reviewed by Carlos Garcia Campos.

No new tests needed.

* platform/gtk/CursorGtk.cpp:
(WebCore::fallbackCursor): Utility function which returns the "default" cursor for GTK4.
(WebCore::createNamedCursor): Adapt to the changes in the gdk_cursor_new_from_name().
(WebCore::createCustomCursor): Create a GdkTexture directly when the given Cairo surface is
in one of the pixel formats supported by gdk_memory_texture_new(), otherwise convert first;
then create a GdkCursor from the GdkTexture.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkCursorGtkcpp">trunk/Source/WebCore/platform/gtk/CursorGtk.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (260122 => 260123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-04-15 12:28:39 UTC (rev 260122)
+++ trunk/Source/WebCore/ChangeLog      2020-04-15 13:08:25 UTC (rev 260123)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2020-04-15  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK4] Adapt to cursor API changes
+        https://bugs.webkit.org/show_bug.cgi?id=210453
+
+        Reviewed by Carlos Garcia Campos.
+
+        No new tests needed.
+
+        * platform/gtk/CursorGtk.cpp:
+        (WebCore::fallbackCursor): Utility function which returns the "default" cursor for GTK4.
+        (WebCore::createNamedCursor): Adapt to the changes in the gdk_cursor_new_from_name().
+        (WebCore::createCustomCursor): Create a GdkTexture directly when the given Cairo surface is
+        in one of the pixel formats supported by gdk_memory_texture_new(), otherwise convert first;
+        then create a GdkCursor from the GdkTexture.
+
</ins><span class="cx"> 2020-04-14  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Async overflow scroll] Backgrounds missing on gmail sometimes
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkCursorGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/CursorGtk.cpp (260122 => 260123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/CursorGtk.cpp  2020-04-15 12:28:39 UTC (rev 260122)
+++ trunk/Source/WebCore/platform/gtk/CursorGtk.cpp     2020-04-15 13:08:25 UTC (rev 260123)
</span><span class="lines">@@ -32,12 +32,25 @@
</span><span class="cx"> #include "Image.h"
</span><span class="cx"> #include "IntPoint.h"
</span><span class="cx"> #include <gdk/gdk.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><ins>+#if USE(GTK4)
+static GRefPtr<GdkCursor> fallbackCursor()
+{
+    static WTF::NeverDestroyed<GRefPtr<GdkCursor>> cursor(adoptGRef(gdk_cursor_new_from_name("default", nullptr)));
+    return cursor;
+}
+#endif // USE(GTK4)
+
</ins><span class="cx"> static GRefPtr<GdkCursor> createNamedCursor(const char* name)
</span><span class="cx"> {
</span><ins>+#if USE(GTK4)
+    return adoptGRef(gdk_cursor_new_from_name(name, fallbackCursor().get()));
+#else
</ins><span class="cx">     return adoptGRef(gdk_cursor_new_from_name(gdk_display_get_default(), name));
</span><ins>+#endif // USE(GTK4)
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static GRefPtr<GdkCursor> createCustomCursor(Image* image, const IntPoint& hotSpot)
</span><span class="lines">@@ -47,7 +60,14 @@
</span><span class="cx">         return nullptr;
</span><span class="cx"> 
</span><span class="cx">     IntPoint effectiveHotSpot = determineHotSpot(image, hotSpot);
</span><ins>+
+#if USE(GTK4)
+    ASSERT(cairo_image_surface_get_format(surface.get()) == CAIRO_FORMAT_ARGB32);
+    auto texture = adoptGRef(gdk_memory_texture_new(cairo_image_surface_get_width(surface.get()), cairo_image_surface_get_height(surface.get()), GDK_MEMORY_A8R8G8B8_PREMULTIPLIED, cairo_image_surface_get_stride(surface.get())));
+    return adoptGRef(gdk_cursor_new_from_texture(texture.get(), effectiveHotSpot.x(), effectiveHotSpot.y(), fallbackCursor().get()));
+#else
</ins><span class="cx">     return adoptGRef(gdk_cursor_new_from_surface(gdk_display_get_default(), surface.get(), effectiveHotSpot.x(), effectiveHotSpot.y()));
</span><ins>+#endif // USE(GTK4)
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void Cursor::ensurePlatformCursor() const
</span></span></pre>
</div>
</div>

</body>
</html>