Changeset 263843 in webkit

Timestamp:

Jul 2, 2020, 5:41:34 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Unreviewed. Fix GTK4 build

Source/WebCore:

• platform/gtk/GtkVersioning.h:

(gtk_scrolled_window_new):

Source/WebKit:

• UIProcess/API/gtk/WebKitScriptDialogImpl.cpp:

(webkitScriptDialogImplConstructed):

• UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp:

(WebKit::WebDataListSuggestionsDropdownGtk::WebDataListSuggestionsDropdownGtk):

• UIProcess/gtk/WebPopupMenuProxyGtk.cpp:

(WebKit::WebPopupMenuProxyGtk::createPopupMenu):

Tools:

• MiniBrowser/gtk/BrowserSettingsDialog.c:

(browser_settings_dialog_init):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/gtk/GtkVersioning.h (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/gtk/WebKitScriptDialogImpl.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp (modified) (2 diffs)
• Source/WebKit/UIProcess/gtk/WebPopupMenuProxyGtk.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/MiniBrowser/gtk/BrowserSettingsDialog.c (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-02  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix GTK4 build
+
+        * platform/gtk/GtkVersioning.h:
+        (gtk_scrolled_window_new):
+
 2020-07-02  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/platform/gtk/GtkVersioning.h

@@ -253 +253 @@
 }
 
+static inline GtkWidget*
+gtk_scrolled_window_new()
+{
+    return gtk_scrolled_window_new(nullptr, nullptr);
+}
+
 #endif // USE(GTK4)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-07-02  Carlos Garcia Campos  <cgarcia@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  <sabouhallawa@apple.com>
 

trunk/Source/WebKit/UIProcess/API/gtk/WebKitScriptDialogImpl.cpp

@@ -154 +154 @@
 #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)

trunk/Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp

@@ -32 +32 @@
 #include <WebCore/DataListSuggestionInformation.h>
 #include <WebCore/GtkUtilities.h>
+#include <WebCore/GtkVersioning.h>
 #include <WebCore/IntPoint.h>
 #include <wtf/glib/GRefPtr.h>
@@ -64 +65 @@
     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)

trunk/Source/WebKit/UIProcess/gtk/WebPopupMenuProxyGtk.cpp

@@ -235 +235 @@
     }, 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)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-07-02  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix GTK4 build
+
+        * MiniBrowser/gtk/BrowserSettingsDialog.c:
+        (browser_settings_dialog_init):
+
 2020-07-02  Philippe Normand  <pnormand@igalia.com>
 

trunk/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c

@@ -136 +136 @@
     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);