Diff
Modified: trunk/Source/WebCore/ChangeLog (263842 => 263843)
--- trunk/Source/WebCore/ChangeLog 2020-07-02 12:40:49 UTC (rev 263842)
+++ trunk/Source/WebCore/ChangeLog 2020-07-02 12:41:34 UTC (rev 263843)
@@ -1,3 +1,10 @@
+2020-07-02 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Fix GTK4 build
+
+ * platform/gtk/GtkVersioning.h:
+ (gtk_scrolled_window_new):
+
2020-07-02 Rob Buis <rb...@igalia.com>
Fragment navigation involving fragment identifiers does not match specification
Modified: trunk/Source/WebCore/platform/gtk/GtkVersioning.h (263842 => 263843)
--- trunk/Source/WebCore/platform/gtk/GtkVersioning.h 2020-07-02 12:40:49 UTC (rev 263842)
+++ trunk/Source/WebCore/platform/gtk/GtkVersioning.h 2020-07-02 12:41:34 UTC (rev 263843)
@@ -252,4 +252,10 @@
gtk_window_deiconify(window);
}
+static inline GtkWidget*
+gtk_scrolled_window_new()
+{
+ return gtk_scrolled_window_new(nullptr, nullptr);
+}
+
#endif // USE(GTK4)
Modified: trunk/Source/WebKit/ChangeLog (263842 => 263843)
--- trunk/Source/WebKit/ChangeLog 2020-07-02 12:40:49 UTC (rev 263842)
+++ trunk/Source/WebKit/ChangeLog 2020-07-02 12:41:34 UTC (rev 263843)
@@ -1,3 +1,14 @@
+2020-07-02 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Fix GTK4 build
+
+ * UIProcess/API/gtk/WebKitScriptDialogImpl.cpp:
+ (webkitScriptDialogImplConstructed):
+ * UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp:
+ (WebKit::WebDataListSuggestionsDropdownGtk::WebDataListSuggestionsDropdownGtk):
+ * UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
+ (WebKit::WebPopupMenuProxyGtk::createPopupMenu):
+
2020-07-01 Said Abou-Hallawa <sabouhall...@apple.com>
MIMETypeRegistry::getExtensionsForMIMEType() needs to handle wildcard MIME types
Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitScriptDialogImpl.cpp (263842 => 263843)
--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitScriptDialogImpl.cpp 2020-07-02 12:40:49 UTC (rev 263842)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitScriptDialogImpl.cpp 2020-07-02 12:41:34 UTC (rev 263843)
@@ -153,7 +153,7 @@
gtk_widget_show(messageArea);
#endif
- priv->swindow = gtk_scrolled_window_new(nullptr, nullptr);
+ priv->swindow = gtk_scrolled_window_new();
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(priv->swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
#if USE(GTK4)
gtk_box_append(GTK_BOX(messageArea), priv->swindow);
Modified: trunk/Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp (263842 => 263843)
--- trunk/Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp 2020-07-02 12:40:49 UTC (rev 263842)
+++ trunk/Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp 2020-07-02 12:41:34 UTC (rev 263843)
@@ -31,6 +31,7 @@
#include "WebPageProxy.h"
#include <WebCore/DataListSuggestionInformation.h>
#include <WebCore/GtkUtilities.h>
+#include <WebCore/GtkVersioning.h>
#include <WebCore/IntPoint.h>
#include <wtf/glib/GRefPtr.h>
#include <wtf/glib/GUniquePtr.h>
@@ -63,7 +64,7 @@
g_signal_connect_object(selection, "changed", G_CALLBACK(firstTimeItemSelectedCallback), treeView, static_cast<GConnectFlags>(0));
gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
- auto* swindow = gtk_scrolled_window_new(nullptr, nullptr);
+ auto* swindow = gtk_scrolled_window_new();
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
#if USE(GTK4)
gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(swindow), m_treeView);
Modified: trunk/Source/WebKit/UIProcess/gtk/WebPopupMenuProxyGtk.cpp (263842 => 263843)
--- trunk/Source/WebKit/UIProcess/gtk/WebPopupMenuProxyGtk.cpp 2020-07-02 12:40:49 UTC (rev 263842)
+++ trunk/Source/WebKit/UIProcess/gtk/WebPopupMenuProxyGtk.cpp 2020-07-02 12:41:34 UTC (rev 263843)
@@ -234,7 +234,7 @@
return !isGroup && isEnabled;
}, nullptr, nullptr);
- auto* swindow = gtk_scrolled_window_new(nullptr, nullptr);
+ auto* swindow = gtk_scrolled_window_new();
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
#if USE(GTK4)
gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(swindow), m_treeView);
Modified: trunk/Tools/ChangeLog (263842 => 263843)
--- trunk/Tools/ChangeLog 2020-07-02 12:40:49 UTC (rev 263842)
+++ trunk/Tools/ChangeLog 2020-07-02 12:41:34 UTC (rev 263843)
@@ -1,3 +1,10 @@
+2020-07-02 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Fix GTK4 build
+
+ * MiniBrowser/gtk/BrowserSettingsDialog.c:
+ (browser_settings_dialog_init):
+
2020-07-02 Philippe Normand <pnorm...@igalia.com>
[Flatpak SDK] Add perl-term-readkey
Modified: trunk/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c (263842 => 263843)
--- trunk/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c 2020-07-02 12:40:49 UTC (rev 263842)
+++ trunk/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c 2020-07-02 12:41:34 UTC (rev 263843)
@@ -135,7 +135,11 @@
gtk_dialog_add_button(GTK_DIALOG(dialog), "_Close", GTK_RESPONSE_CLOSE);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
+#if GTK_CHECK_VERSION(3, 98, 5)
+ GtkWidget *scrolledWindow = gtk_scrolled_window_new();
+#else
GtkWidget *scrolledWindow = gtk_scrolled_window_new(NULL, NULL);
+#endif
gtk_widget_set_margin_start(scrolledWindow, 5);
gtk_widget_set_margin_end(scrolledWindow, 5);
gtk_widget_set_margin_top(scrolledWindow, 5);
