Title: [260418] trunk/Source/WebCore
Revision
260418
Author
csaave...@igalia.com
Date
2020-04-21 01:38:23 -0700 (Tue, 21 Apr 2020)

Log Message

[GTK4] Fix platform GDK includes
https://bugs.webkit.org/show_bug.cgi?id=210746

Reviewed by Carlos Garcia Campos.

* platform/graphics/PlatformDisplay.cpp: Wayland, X11, etc.
platform includes changed path, so update accordingly.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (260417 => 260418)


--- trunk/Source/WebCore/ChangeLog	2020-04-21 07:48:52 UTC (rev 260417)
+++ trunk/Source/WebCore/ChangeLog	2020-04-21 08:38:23 UTC (rev 260418)
@@ -1,3 +1,13 @@
+2020-04-21  Claudio Saavedra  <csaave...@igalia.com>
+
+        [GTK4] Fix platform GDK includes
+        https://bugs.webkit.org/show_bug.cgi?id=210746
+
+        Reviewed by Carlos Garcia Campos.
+
+        * platform/graphics/PlatformDisplay.cpp: Wayland, X11, etc.
+        platform includes changed path, so update accordingly.
+
 2020-04-21  Adrian Perez de Castro  <ape...@igalia.com>
 
         Non-unified build fixes late February 2020 edition

Modified: trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp (260417 => 260418)


--- trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp	2020-04-21 07:48:52 UTC (rev 260417)
+++ trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp	2020-04-21 08:38:23 UTC (rev 260418)
@@ -51,7 +51,11 @@
 #endif
 
 #if PLATFORM(GTK) && PLATFORM(X11)
+#if USE(GTK4)
+#include <gdk/x11/gdkx.h>
+#else
 #include <gdk/gdkx.h>
+#endif
 #if defined(None)
 #undef None
 #endif
@@ -58,8 +62,12 @@
 #endif
 
 #if PLATFORM(GTK) && PLATFORM(WAYLAND)
+#if USE(GTK4)
+#include <gdk/wayland/gdkwayland.h>
+#else
 #include <gdk/gdkwayland.h>
 #endif
+#endif
 
 #if USE(EGL)
 #if USE(LIBEPOXY)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to