Title: [259754] trunk/Source
Revision
259754
Author
[email protected]
Date
2020-04-08 13:54:14 -0700 (Wed, 08 Apr 2020)

Log Message

[GTK4] Make PAL::systemBeep() work
https://bugs.webkit.org/show_bug.cgi?id=210158

Reviewed by Carlos Garcia Campos.

Source/WebCore/PAL:

* pal/system/gtk/SoundGtk.cpp:
(PAL::systemBeep): Use gdk_display_beep(), which works both with GTK3 and GTK4.

Source/WTF:

* wtf/Platform.h: Define a value for GDK_VERSION_MIN_REQUIRED suitable for GTK4.

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (259753 => 259754)


--- trunk/Source/WTF/ChangeLog	2020-04-08 20:15:58 UTC (rev 259753)
+++ trunk/Source/WTF/ChangeLog	2020-04-08 20:54:14 UTC (rev 259754)
@@ -1,3 +1,12 @@
+2020-04-08  Adrian Perez de Castro  <[email protected]>
+
+        [GTK4] Make PAL::systemBeep() work
+        https://bugs.webkit.org/show_bug.cgi?id=210158
+
+        Reviewed by Carlos Garcia Campos.
+
+        * wtf/Platform.h: Define a value for GDK_VERSION_MIN_REQUIRED suitable for GTK4.
+
 2020-04-08  Tim Horton  <[email protected]>
 
         Rearrange and simplify some JSC feature flags

Modified: trunk/Source/WTF/wtf/Platform.h (259753 => 259754)


--- trunk/Source/WTF/wtf/Platform.h	2020-04-08 20:15:58 UTC (rev 259753)
+++ trunk/Source/WTF/wtf/Platform.h	2020-04-08 20:54:14 UTC (rev 259754)
@@ -84,8 +84,12 @@
 
 #if PLATFORM(GTK)
 #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_36
+#if USE(GTK4)
+#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_92
+#else
 #define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_6
 #endif
+#endif
 
 #if PLATFORM(WPE)
 #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_40

Modified: trunk/Source/WebCore/PAL/ChangeLog (259753 => 259754)


--- trunk/Source/WebCore/PAL/ChangeLog	2020-04-08 20:15:58 UTC (rev 259753)
+++ trunk/Source/WebCore/PAL/ChangeLog	2020-04-08 20:54:14 UTC (rev 259754)
@@ -1,3 +1,13 @@
+2020-04-08  Adrian Perez de Castro  <[email protected]>
+
+        [GTK4] Make PAL::systemBeep() work
+        https://bugs.webkit.org/show_bug.cgi?id=210158
+
+        Reviewed by Carlos Garcia Campos.
+
+        * pal/system/gtk/SoundGtk.cpp:
+        (PAL::systemBeep): Use gdk_display_beep(), which works both with GTK3 and GTK4.
+
 2020-04-07  Adrian Perez de Castro  <[email protected]>
 
         [GTK] CMake find module for GTK4

Modified: trunk/Source/WebCore/PAL/pal/system/gtk/SoundGtk.cpp (259753 => 259754)


--- trunk/Source/WebCore/PAL/pal/system/gtk/SoundGtk.cpp	2020-04-08 20:15:58 UTC (rev 259753)
+++ trunk/Source/WebCore/PAL/pal/system/gtk/SoundGtk.cpp	2020-04-08 20:54:14 UTC (rev 259754)
@@ -26,7 +26,8 @@
 
 void systemBeep()
 {
-    gdk_beep();
+    if (auto* display = gdk_display_get_default())
+        gdk_display_beep(display);
 }
 
 } // namespace PAL
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to