Diff
Modified: trunk/Source/WebCore/ChangeLog (262935 => 262936)
--- trunk/Source/WebCore/ChangeLog 2020-06-12 07:01:36 UTC (rev 262935)
+++ trunk/Source/WebCore/ChangeLog 2020-06-12 08:19:58 UTC (rev 262936)
@@ -1,3 +1,22 @@
+2020-06-12 Carlos Garcia Campos <[email protected]>
+
+ [GTK4] Make WebDriver work
+ https://bugs.webkit.org/show_bug.cgi?id=212316
+
+ Reviewed by Adrian Perez de Castro.
+
+ Add helper gtk definitions to avoid ifdefs and implement currentScreenMonitor() for GTK4.
+
+ * platform/gtk/GtkVersioning.h:
+ (gtk_window_move):
+ (gtk_window_minimize):
+ (gtk_window_unminimize):
+ * platform/gtk/PlatformScreenGtk.cpp:
+ (WebCore::currentScreenMonitor):
+ (WebCore::screenRect):
+ (WebCore::screenAvailableRect):
+ (WebCore::getCurrentScreenMonitor): Deleted.
+
2020-06-11 David Kilzer <[email protected]>
[IPC] Add WTF::EnumTraits<> for every enum type used in IPC
Modified: trunk/Source/WebCore/platform/gtk/GtkVersioning.h (262935 => 262936)
--- trunk/Source/WebCore/platform/gtk/GtkVersioning.h 2020-06-12 07:01:36 UTC (rev 262935)
+++ trunk/Source/WebCore/platform/gtk/GtkVersioning.h 2020-06-12 08:19:58 UTC (rev 262936)
@@ -58,6 +58,11 @@
}
static inline void
+gtk_window_move(GtkWindow*, int, int)
+{
+}
+
+static inline void
gtk_init(int*, char***)
{
gtk_init();
@@ -235,4 +240,16 @@
gtk_style_context_add_class(gtk_widget_get_style_context(widget), name);
}
+static inline void
+gtk_window_minimize(GtkWindow* window)
+{
+ gtk_window_iconify(window);
+}
+
+static inline void
+gtk_window_unminimize(GtkWindow* window)
+{
+ gtk_window_deiconify(window);
+}
+
#endif // USE(GTK4)
Modified: trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp (262935 => 262936)
--- trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp 2020-06-12 07:01:36 UTC (rev 262935)
+++ trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp 2020-06-12 08:19:58 UTC (rev 262936)
@@ -168,15 +168,15 @@
}
}
-GdkMonitor* getCurrentScreenMonitor()
+static GRefPtr<GdkMonitor> currentScreenMonitor()
{
-#if USE(GTK4)
- return nullptr;
-#else
GdkDisplay* display = gdk_display_get_default();
if (!display)
return nullptr;
+#if USE(GTK4)
+ return adoptGRef(static_cast<GdkMonitor*>(g_list_model_get_item(gdk_display_get_monitors(display), 0)));
+#else
auto* rootWindow = gdk_get_default_root_window();
if (!rootWindow)
return nullptr;
@@ -190,11 +190,11 @@
{
GdkRectangle geometry;
- auto* monitor = getCurrentScreenMonitor();
+ auto monitor = currentScreenMonitor();
if (!monitor)
return { };
- gdk_monitor_get_geometry(monitor, &geometry);
+ gdk_monitor_get_geometry(monitor.get(), &geometry);
return FloatRect(geometry.x, geometry.y, geometry.width, geometry.height);
}
@@ -201,13 +201,12 @@
FloatRect screenAvailableRect(Widget*)
{
- GdkRectangle workArea;
-
- auto* monitor = getCurrentScreenMonitor();
+ auto monitor = currentScreenMonitor();
if (!monitor)
return { };
- gdk_monitor_get_workarea(monitor, &workArea);
+ GdkRectangle workArea;
+ gdk_monitor_get_workarea(monitor.get(), &workArea);
return FloatRect(workArea.x, workArea.y, workArea.width, workArea.height);
}
Modified: trunk/Source/WebKit/ChangeLog (262935 => 262936)
--- trunk/Source/WebKit/ChangeLog 2020-06-12 07:01:36 UTC (rev 262935)
+++ trunk/Source/WebKit/ChangeLog 2020-06-12 08:19:58 UTC (rev 262936)
@@ -1,3 +1,21 @@
+2020-06-12 Carlos Garcia Campos <[email protected]>
+
+ [GTK4] Make WebDriver work
+ https://bugs.webkit.org/show_bug.cgi?id=212316
+
+ Reviewed by Adrian Perez de Castro.
+
+ Fix UIClient::setWindowFrame to wait for surface size-changed signal after resizing the window and implement
+ maximize, minimize and restore windows for GTK4.
+
+ * UIProcess/API/glib/WebKitUIClient.cpp:
+ * UIProcess/API/gtk/WebKitWebViewGtk.cpp:
+ (surfaceStateChangedCallback):
+ (webkitWebViewMonitorWindowState):
+ (webkitWebViewMaximizeWindow):
+ (webkitWebViewMinimizeWindow):
+ (webkitWebViewRestoreWindow):
+
2020-06-11 David Kilzer <[email protected]>
[IPC] Add WTF::EnumTraits<> for every enum type used in IPC
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp (262935 => 262936)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp 2020-06-12 07:01:36 UTC (rev 262935)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp 2020-06-12 08:19:58 UTC (rev 262936)
@@ -200,8 +200,13 @@
if (!needsMove && !needsResize)
return;
- // There is no GtkWidget::configure-event in GTK4, move is not supported.
-#if !USE(GTK4)
+#if USE(GTK4)
+ auto* surface = gtk_native_get_surface(GTK_NATIVE(window));
+ auto signalID = g_signal_connect(surface, "size-changed", G_CALLBACK(+[](GdkSurface*, int width, int height, GdkRectangle* targetGeometry) {
+ if (width == targetGeometry->width && height == targetGeometry->height)
+ RunLoop::current().stop();
+ }), &geometry);
+#else
auto signalID = g_signal_connect(window, "configure-event", G_CALLBACK(windowConfigureEventCallback), &geometry);
if (needsMove)
gtk_window_move(GTK_WINDOW(window), geometry.x, geometry.y);
@@ -216,7 +221,9 @@
timer->startOneShot(200_ms);
RunLoop::run();
timer = nullptr;
-#if !USE(GTK4)
+#if USE(GTK4)
+ g_signal_handler_disconnect(surface, signalID);
+#else
g_signal_handler_disconnect(window, signalID);
#endif
} else
Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp (262935 => 262936)
--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2020-06-12 07:01:36 UTC (rev 262935)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2020-06-12 08:19:58 UTC (rev 262936)
@@ -2605,7 +2605,9 @@
auto keycode = widgetKeyvalToKeycode(GTK_WIDGET(webViewBase), keyval);
if (modifiers && shouldTranslate == ShouldTranslateKeyboardState::Yes) {
auto* display = gtk_widget_get_display(GTK_WIDGET(webViewBase));
-#if !USE(GTK4)
+#if USE(GTK4)
+ gdk_display_translate_key(display, keycode, static_cast<GdkModifierType>(modifiers), 0, &keyval, nullptr, nullptr, nullptr);
+#else
gdk_keymap_translate_keyboard_state(gdk_keymap_get_for_display(display), keycode, static_cast<GdkModifierType>(modifiers), 0, &keyval, nullptr, nullptr, nullptr);
#endif
}
Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewGtk.cpp (262935 => 262936)
--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewGtk.cpp 2020-06-12 07:01:36 UTC (rev 262935)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewGtk.cpp 2020-06-12 08:19:58 UTC (rev 262936)
@@ -26,6 +26,7 @@
#include "WebKitWebViewPrivate.h"
#include <WebCore/Color.h>
#include <WebCore/GtkUtilities.h>
+#include <WebCore/GtkVersioning.h>
#include <WebCore/PlatformDisplay.h>
#include <WebCore/PlatformScreen.h>
#include <glib/gi18n-lib.h>
@@ -97,8 +98,9 @@
return TRUE;
}
-#if !USE(GTK4)
struct WindowStateEvent {
+ WTF_MAKE_STRUCT_FAST_ALLOCATED;
+
enum class Type { Maximize, Minimize, Restore };
WindowStateEvent(Type type, CompletionHandler<void()>&& completionHandler)
@@ -128,6 +130,38 @@
static const char* gWindowStateEventID = "wk-window-state-event";
+#if USE(GTK4)
+static void surfaceStateChangedCallback(GdkSurface* surface, GParamSpec*, WebKitWebView* view)
+{
+ auto* state = static_cast<WindowStateEvent*>(g_object_get_data(G_OBJECT(view), gWindowStateEventID));
+ if (!state) {
+ g_signal_handlers_disconnect_by_func(surface, reinterpret_cast<gpointer>(surfaceStateChangedCallback), view);
+ return;
+ }
+
+ auto surfaceState = gdk_toplevel_get_state(GDK_TOPLEVEL(surface));
+ bool eventCompleted = false;
+ switch (state->type) {
+ case WindowStateEvent::Type::Maximize:
+ if (surfaceState & GDK_SURFACE_STATE_MAXIMIZED)
+ eventCompleted = true;
+ break;
+ case WindowStateEvent::Type::Minimize:
+ if ((surfaceState & GDK_SURFACE_STATE_MINIMIZED) || !gdk_surface_get_mapped(surface))
+ eventCompleted = true;
+ break;
+ case WindowStateEvent::Type::Restore:
+ if (!(surfaceState & GDK_SURFACE_STATE_MAXIMIZED) && !(surfaceState & GDK_SURFACE_STATE_MINIMIZED))
+ eventCompleted = true;
+ break;
+ }
+
+ if (eventCompleted) {
+ g_signal_handlers_disconnect_by_func(surface, reinterpret_cast<gpointer>(surfaceStateChangedCallback), view);
+ g_object_set_data(G_OBJECT(view), gWindowStateEventID, nullptr);
+ }
+}
+#else
static gboolean windowStateEventCallback(GtkWidget* window, GdkEventWindowState* event, WebKitWebView* view)
{
auto* state = static_cast<WindowStateEvent*>(g_object_get_data(G_OBJECT(view), gWindowStateEventID));
@@ -161,9 +195,22 @@
}
#endif
+static void
+webkitWebViewMonitorWindowState(WebKitWebView* view, GtkWindow* window, WindowStateEvent::Type type, CompletionHandler<void()>&& completionHandler)
+{
+ g_object_set_data_full(G_OBJECT(view), gWindowStateEventID, new WindowStateEvent(type, WTFMove(completionHandler)), [](gpointer userData) {
+ delete static_cast<WindowStateEvent*>(userData);
+ });
+
+#if USE(GTK4)
+ g_signal_connect_object(gtk_native_get_surface(GTK_NATIVE(window)), "notify::state", G_CALLBACK(surfaceStateChangedCallback), view, G_CONNECT_AFTER);
+#else
+ g_signal_connect_object(window, "window-state-event", G_CALLBACK(windowStateEventCallback), view, G_CONNECT_AFTER);
+#endif
+}
+
void webkitWebViewMaximizeWindow(WebKitWebView* view, CompletionHandler<void()>&& completionHandler)
{
-#if !USE(GTK4)
auto* topLevel = gtk_widget_get_toplevel(GTK_WIDGET(view));
if (!gtk_widget_is_toplevel(topLevel)) {
completionHandler();
@@ -176,11 +223,9 @@
return;
}
- g_object_set_data_full(G_OBJECT(view), gWindowStateEventID, new WindowStateEvent(WindowStateEvent::Type::Maximize, WTFMove(completionHandler)), [](gpointer userData) {
- delete static_cast<WindowStateEvent*>(userData);
- });
- g_signal_connect_object(window, "window-state-event", G_CALLBACK(windowStateEventCallback), view, G_CONNECT_AFTER);
+ webkitWebViewMonitorWindowState(view, window, WindowStateEvent::Type::Maximize, WTFMove(completionHandler));
gtk_window_maximize(window);
+
#if ENABLE(DEVELOPER_MODE)
// Xvfb doesn't support maximize, so we resize the window to the screen size.
if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::X11) {
@@ -193,12 +238,10 @@
}
#endif
gtk_widget_show(topLevel);
-#endif
}
void webkitWebViewMinimizeWindow(WebKitWebView* view, CompletionHandler<void()>&& completionHandler)
{
-#if !USE(GTK4)
auto* topLevel = gtk_widget_get_toplevel(GTK_WIDGET(view));
if (!gtk_widget_is_toplevel(topLevel)) {
completionHandler();
@@ -206,18 +249,13 @@
}
auto* window = GTK_WINDOW(topLevel);
- g_object_set_data_full(G_OBJECT(view), gWindowStateEventID, new WindowStateEvent(WindowStateEvent::Type::Minimize, WTFMove(completionHandler)), [](gpointer userData) {
- delete static_cast<WindowStateEvent*>(userData);
- });
- g_signal_connect_object(window, "window-state-event", G_CALLBACK(windowStateEventCallback), view, G_CONNECT_AFTER);
- gtk_window_iconify(window);
+ webkitWebViewMonitorWindowState(view, window, WindowStateEvent::Type::Minimize, WTFMove(completionHandler));
+ gtk_window_minimize(window);
gtk_widget_hide(topLevel);
-#endif
}
void webkitWebViewRestoreWindow(WebKitWebView* view, CompletionHandler<void()>&& completionHandler)
{
-#if !USE(GTK4)
auto* topLevel = gtk_widget_get_toplevel(GTK_WIDGET(view));
if (!gtk_widget_is_toplevel(topLevel)) {
completionHandler();
@@ -230,14 +268,12 @@
return;
}
- g_object_set_data_full(G_OBJECT(view), gWindowStateEventID, new WindowStateEvent(WindowStateEvent::Type::Restore, WTFMove(completionHandler)), [](gpointer userData) {
- delete static_cast<WindowStateEvent*>(userData);
- });
- g_signal_connect_object(window, "window-state-event", G_CALLBACK(windowStateEventCallback), view, G_CONNECT_AFTER);
+ webkitWebViewMonitorWindowState(view, window, WindowStateEvent::Type::Restore, WTFMove(completionHandler));
if (gtk_window_is_maximized(window))
gtk_window_unmaximize(window);
if (!gtk_widget_get_mapped(topLevel))
- gtk_window_deiconify(window);
+ gtk_window_unminimize(window);
+
#if ENABLE(DEVELOPER_MODE)
// Xvfb doesn't support maximize, so we resize the window to the default size.
if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::X11) {
@@ -250,7 +286,6 @@
}
#endif
gtk_widget_show(topLevel);
-#endif
}
/**
Modified: trunk/Tools/ChangeLog (262935 => 262936)
--- trunk/Tools/ChangeLog 2020-06-12 07:01:36 UTC (rev 262935)
+++ trunk/Tools/ChangeLog 2020-06-12 08:19:58 UTC (rev 262936)
@@ -1,3 +1,15 @@
+2020-06-12 Carlos Garcia Campos <[email protected]>
+
+ [GTK4] Make WebDriver work
+ https://bugs.webkit.org/show_bug.cgi?id=212316
+
+ Reviewed by Adrian Perez de Castro.
+
+ Stop connecting to WebKitWebView::close signal twice for newaly created windows.
+
+ * MiniBrowser/gtk/BrowserWindow.c:
+ (webViewCreate):
+
2020-06-11 Saam Barati <[email protected]>
Skip wasm-js2 test on memory limited devices
Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (262935 => 262936)
--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2020-06-12 07:01:36 UTC (rev 262935)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2020-06-12 08:19:58 UTC (rev 262936)
@@ -371,7 +371,6 @@
gtk_widget_grab_focus(GTK_WIDGET(newWebView));
g_signal_connect(newWebView, "ready-to-show", G_CALLBACK(webViewReadyToShow), newWindow);
g_signal_connect(newWebView, "run-as-modal", G_CALLBACK(webViewRunAsModal), newWindow);
- g_signal_connect(newWebView, "close", G_CALLBACK(webViewClose), newWindow);
return GTK_WIDGET(newWebView);
}