Diff
Modified: trunk/Source/WTF/ChangeLog (271230 => 271231)
--- trunk/Source/WTF/ChangeLog 2021-01-07 09:02:47 UTC (rev 271230)
+++ trunk/Source/WTF/ChangeLog 2021-01-07 10:02:44 UTC (rev 271231)
@@ -1,3 +1,12 @@
+2021-01-07 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Build failures with GTK4 3.99.5.1
+ https://bugs.webkit.org/show_bug.cgi?id=219844
+
+ Reviewed by Philippe Normand.
+
+ * wtf/Platform.h:
+
2021-01-06 Jer Noble <[email protected]>
[Cocoa] Revert audioTimePitchAlgorithm to "TimeDomain" from "Spectral"
Modified: trunk/Source/WTF/wtf/Platform.h (271230 => 271231)
--- trunk/Source/WTF/wtf/Platform.h 2021-01-07 09:02:47 UTC (rev 271230)
+++ trunk/Source/WTF/wtf/Platform.h 2021-01-07 10:02:44 UTC (rev 271231)
@@ -85,7 +85,7 @@
#if PLATFORM(GTK)
#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_44
#if USE(GTK4)
-#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_92
+#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_4_0
#else
#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_22
#endif
Modified: trunk/Source/WebCore/ChangeLog (271230 => 271231)
--- trunk/Source/WebCore/ChangeLog 2021-01-07 09:02:47 UTC (rev 271230)
+++ trunk/Source/WebCore/ChangeLog 2021-01-07 10:02:44 UTC (rev 271231)
@@ -1,3 +1,14 @@
+2021-01-07 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Build failures with GTK4 3.99.5.1
+ https://bugs.webkit.org/show_bug.cgi?id=219844
+
+ Reviewed by Philippe Normand.
+
+ * platform/gtk/GtkVersioning.h:
+ (gtk_window_resize):
+ (gtk_window_get_size):
+
2021-01-06 Rob Buis <[email protected]>
Fix aspect ratio handling in RenderBox::computeLogicalWidthInFragment
Modified: trunk/Source/WebCore/platform/gtk/GtkVersioning.h (271230 => 271231)
--- trunk/Source/WebCore/platform/gtk/GtkVersioning.h 2021-01-07 09:02:47 UTC (rev 271230)
+++ trunk/Source/WebCore/platform/gtk/GtkVersioning.h 2021-01-07 10:02:44 UTC (rev 271231)
@@ -63,6 +63,18 @@
}
static inline void
+gtk_window_resize(GtkWindow* window, int width, int height)
+{
+ gtk_window_set_default_size(window, width, height);
+}
+
+static inline void
+gtk_window_get_size(GtkWindow* window, int* width, int* height)
+{
+ gtk_window_get_default_size(window, width, height);
+}
+
+static inline void
gtk_init(int*, char***)
{
gtk_init();
Modified: trunk/Source/WebKit/ChangeLog (271230 => 271231)
--- trunk/Source/WebKit/ChangeLog 2021-01-07 09:02:47 UTC (rev 271230)
+++ trunk/Source/WebKit/ChangeLog 2021-01-07 10:02:44 UTC (rev 271231)
@@ -1,3 +1,13 @@
+2021-01-07 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Build failures with GTK4 3.99.5.1
+ https://bugs.webkit.org/show_bug.cgi?id=219844
+
+ Reviewed by Philippe Normand.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseSizeAllocate):
+
2021-01-07 Youenn Fablet <[email protected]>
WKWebView should expose navigator.mediaDevices when content is loaded from app bundle
Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp (271230 => 271231)
--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2021-01-07 09:02:47 UTC (rev 271230)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2021-01-07 10:02:44 UTC (rev 271231)
@@ -862,8 +862,8 @@
#if USE(GTK4)
for (auto* child = gtk_widget_get_first_child(widget); child; child = gtk_widget_get_next_sibling(child)) {
- if (GTK_IS_NATIVE(child))
- gtk_native_check_resize(GTK_NATIVE(child));
+ if (GTK_IS_POPOVER(child))
+ gtk_popover_present(GTK_POPOVER(child));
}
#endif
Modified: trunk/Tools/ChangeLog (271230 => 271231)
--- trunk/Tools/ChangeLog 2021-01-07 09:02:47 UTC (rev 271230)
+++ trunk/Tools/ChangeLog 2021-01-07 10:02:44 UTC (rev 271231)
@@ -1,3 +1,16 @@
+2021-01-07 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Build failures with GTK4 3.99.5.1
+ https://bugs.webkit.org/show_bug.cgi?id=219844
+
+ Reviewed by Philippe Normand.
+
+ * MiniBrowser/gtk/BrowserSearchBox.c:
+ (browserSearchBoxSizeAllocate):
+ * MiniBrowser/gtk/BrowserWindow.c:
+ (webViewReadyToShow):
+ * MiniBrowser/gtk/CMakeLists.txt:
+
2021-01-06 Katherine Cheney <[email protected]>
Storage access prompt does not appear on MiniBrowser
Modified: trunk/Tools/MiniBrowser/gtk/BrowserSearchBox.c (271230 => 271231)
--- trunk/Tools/MiniBrowser/gtk/BrowserSearchBox.c 2021-01-07 09:02:47 UTC (rev 271230)
+++ trunk/Tools/MiniBrowser/gtk/BrowserSearchBox.c 2021-01-07 10:02:44 UTC (rev 271231)
@@ -296,7 +296,7 @@
BrowserSearchBox *searchBox = BROWSER_SEARCH_BOX(widget);
if (searchBox->optionsPopover)
- gtk_native_check_resize(GTK_NATIVE(searchBox->optionsPopover));
+ gtk_popover_present(GTK_POPOVER(searchBox->optionsPopover));
}
#endif
Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (271230 => 271231)
--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2021-01-07 09:02:47 UTC (rev 271230)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2021-01-07 10:02:44 UTC (rev 271231)
@@ -399,12 +399,15 @@
GdkRectangle geometry;
webkit_window_properties_get_geometry(windowProperties, &geometry);
-#if !GTK_CHECK_VERSION(3, 98, 0)
+#if GTK_CHECK_VERSION(3, 99, 5)
+ if (geometry.width > 0 && geometry.height > 0)
+ gtk_window_set_default_size(GTK_WINDOW(window), geometry.width, geometry.height);
+#else
if (geometry.x >= 0 && geometry.y >= 0)
gtk_window_move(GTK_WINDOW(window), geometry.x, geometry.y);
-#endif
if (geometry.width > 0 && geometry.height > 0)
gtk_window_resize(GTK_WINDOW(window), geometry.width, geometry.height);
+#endif
if (!webkit_window_properties_get_toolbar_visible(windowProperties))
gtk_widget_hide(window->toolbar);
Modified: trunk/Tools/MiniBrowser/gtk/CMakeLists.txt (271230 => 271231)
--- trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2021-01-07 09:02:47 UTC (rev 271230)
+++ trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2021-01-07 10:02:44 UTC (rev 271231)
@@ -56,7 +56,7 @@
VERBATIM)
if (USE_GTK4)
- set(MiniBrowser_PRIVATE_DEFINITIONS GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_92)
+ set(MiniBrowser_PRIVATE_DEFINITIONS GDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_0)
else ()
set(MiniBrowser_PRIVATE_DEFINITIONS GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_22)
endif ()
