Changeset 259754 in webkit

Timestamp:

Apr 8, 2020, 1:54:14 PM (6 years ago)

Author:

Adrian Perez de Castro

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.

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)
• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/system/gtk/SoundGtk.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-04-08  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [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  <timothy_horton@apple.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -85 +85 @@
 #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
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2020-04-08  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [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  <aperez@igalia.com>
 

trunk/Source/WebCore/PAL/pal/system/gtk/SoundGtk.cpp

@@ -27 +27 @@
 void systemBeep()
 {
-    gdk_beep();
+    if (auto* display = gdk_display_get_default())
+        gdk_display_beep(display);
 }