Diff
Modified: trunk/Source/WebCore/ChangeLog (260131 => 260132)
--- trunk/Source/WebCore/ChangeLog 2020-04-15 15:48:11 UTC (rev 260131)
+++ trunk/Source/WebCore/ChangeLog 2020-04-15 16:06:21 UTC (rev 260132)
@@ -1,3 +1,18 @@
+2020-04-15 Carlos Garcia Campos <[email protected]>
+
+ [GTK4] Fix use of gtk init functions
+ https://bugs.webkit.org/show_bug.cgi?id=210550
+
+ Reviewed by Adrian Perez de Castro.
+
+ Add gtk_init and gtk_init_check receiving parameters to GtkVersioning.
+
+ * PlatformGTK.cmake:
+ * platform/graphics/PlatformDisplay.cpp:
+ * platform/gtk/GtkVersioning.h:
+ (gtk_init):
+ (gtk_init_check):
+
2020-04-15 Yusuke Suzuki <[email protected]>
import.meta.url: baseURL for a module script should be response URL, not request URL
Modified: trunk/Source/WebCore/PlatformGTK.cmake (260131 => 260132)
--- trunk/Source/WebCore/PlatformGTK.cmake 2020-04-15 15:48:11 UTC (rev 260131)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2020-04-15 16:06:21 UTC (rev 260132)
@@ -60,6 +60,7 @@
platform/gtk/GRefPtrGtk.h
platform/gtk/GUniquePtrGtk.h
platform/gtk/GtkUtilities.h
+ platform/gtk/GtkVersioning.h
platform/gtk/PasteboardHelper.h
platform/gtk/ScrollbarThemeGtk.h
platform/gtk/SelectionData.h
Modified: trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp (260131 => 260132)
--- trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2020-04-15 15:48:11 UTC (rev 260131)
+++ trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2020-04-15 16:06:21 UTC (rev 260132)
@@ -47,7 +47,7 @@
#endif
#if PLATFORM(GTK)
-#include <gtk/gtk.h>
+#include "GtkVersioning.h"
#endif
#if PLATFORM(GTK) && PLATFORM(X11)
Modified: trunk/Source/WebCore/platform/gtk/GtkVersioning.h (260131 => 260132)
--- trunk/Source/WebCore/platform/gtk/GtkVersioning.h 2020-04-15 15:48:11 UTC (rev 260131)
+++ trunk/Source/WebCore/platform/gtk/GtkVersioning.h 2020-04-15 16:06:21 UTC (rev 260132)
@@ -45,4 +45,16 @@
*x = *y = 0;
}
+static inline void
+gtk_init(int*, char***)
+{
+ gtk_init();
+}
+
+static inline gboolean
+gtk_init_check(int*, char***)
+{
+ return gtk_init_check();
+}
+
#endif // USE(GTK4)
Modified: trunk/Source/WebKit/ChangeLog (260131 => 260132)
--- trunk/Source/WebKit/ChangeLog 2020-04-15 15:48:11 UTC (rev 260131)
+++ trunk/Source/WebKit/ChangeLog 2020-04-15 16:06:21 UTC (rev 260132)
@@ -1,3 +1,14 @@
+2020-04-15 Carlos Garcia Campos <[email protected]>
+
+ [GTK4] Fix use of gtk init functions
+ https://bugs.webkit.org/show_bug.cgi?id=210550
+
+ Reviewed by Adrian Perez de Castro.
+
+ Include GtkVersioning.h instead of gtk.h
+
+ * WebProcess/gtk/WebProcessMainGtk.cpp:
+
2020-04-15 Peng Liu <[email protected]>
Adopt interface AVAudioRoutingArbiter for Mac
Modified: trunk/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp (260131 => 260132)
--- trunk/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp 2020-04-15 15:48:11 UTC (rev 260131)
+++ trunk/Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp 2020-04-15 16:06:21 UTC (rev 260132)
@@ -29,7 +29,7 @@
#include "AuxiliaryProcessMain.h"
#include "WebProcess.h"
-#include <gtk/gtk.h>
+#include <WebCore/GtkVersioning.h>
#include <libintl.h>
#if PLATFORM(X11)
Modified: trunk/Tools/ChangeLog (260131 => 260132)
--- trunk/Tools/ChangeLog 2020-04-15 15:48:11 UTC (rev 260131)
+++ trunk/Tools/ChangeLog 2020-04-15 16:06:21 UTC (rev 260132)
@@ -1,3 +1,17 @@
+2020-04-15 Carlos Garcia Campos <[email protected]>
+
+ [GTK4] Fix use of gtk init functions
+ https://bugs.webkit.org/show_bug.cgi?id=210550
+
+ Reviewed by Adrian Perez de Castro.
+
+ Include GtkVersioning.h instead of gtk.h.
+
+ * TestWebKitAPI/Tests/WebKitGtk/AccessibilityTestServer.cpp:
+ * TestWebKitAPI/Tests/WebKitGtk/InspectorTestServer.cpp:
+ * TestWebKitAPI/gtk/main.cpp:
+ * WebKitTestRunner/gtk/main.cpp:
+
2020-04-15 Jonathan Bedard <[email protected]>
REGRESSION: [ Mojave+ Debug WK1 ] Layout Test imported/blink/storage/indexeddb/blob-basics-metadata.html is a flaky timeout
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/AccessibilityTestServer.cpp (260131 => 260132)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/AccessibilityTestServer.cpp 2020-04-15 15:48:11 UTC (rev 260131)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/AccessibilityTestServer.cpp 2020-04-15 16:06:21 UTC (rev 260132)
@@ -19,7 +19,7 @@
#include "config.h"
-#include <gtk/gtk.h>
+#include <WebCore/GtkVersioning.h>
#include <webkit2/webkit2.h>
static const char introspectionXML[] =
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/InspectorTestServer.cpp (260131 => 260132)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/InspectorTestServer.cpp 2020-04-15 15:48:11 UTC (rev 260131)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/InspectorTestServer.cpp 2020-04-15 16:06:21 UTC (rev 260132)
@@ -24,7 +24,7 @@
#include "config.h"
-#include <gtk/gtk.h>
+#include <WebCore/GtkVersioning.h>
#include <webkit2/webkit2.h>
int main(int argc, char** argv)
Modified: trunk/Tools/TestWebKitAPI/gtk/main.cpp (260131 => 260132)
--- trunk/Tools/TestWebKitAPI/gtk/main.cpp 2020-04-15 15:48:11 UTC (rev 260131)
+++ trunk/Tools/TestWebKitAPI/gtk/main.cpp 2020-04-15 16:06:21 UTC (rev 260132)
@@ -26,7 +26,7 @@
#include "config.h"
#include "TestsController.h"
-#include <gtk/gtk.h>
+#include <WebCore/GtkVersioning.h>
int main(int argc, char** argv)
{
Modified: trunk/Tools/WebKitTestRunner/gtk/main.cpp (260131 => 260132)
--- trunk/Tools/WebKitTestRunner/gtk/main.cpp 2020-04-15 15:48:11 UTC (rev 260131)
+++ trunk/Tools/WebKitTestRunner/gtk/main.cpp 2020-04-15 16:06:21 UTC (rev 260132)
@@ -26,8 +26,8 @@
#include "config.h"
#include "TestController.h"
+#include <WebCore/GtkVersioning.h>
#include <WebKit/WKTextCheckerGtk.h>
-#include <gtk/gtk.h>
#include <wtf/glib/GRefPtr.h>
int main(int argc, char** argv)
