Diff
Modified: trunk/Source/WebKit/ChangeLog (259712 => 259713)
--- trunk/Source/WebKit/ChangeLog 2020-04-08 10:29:49 UTC (rev 259712)
+++ trunk/Source/WebKit/ChangeLog 2020-04-08 12:25:08 UTC (rev 259713)
@@ -1,3 +1,17 @@
+2020-04-08 Claudio Saavedra <[email protected]>
+
+ [GTK] Drop usage of deprecated GdkDeviceManager
+ https://bugs.webkit.org/show_bug.cgi?id=210179
+
+ Reviewed by Adrian Perez de Castro.
+
+ Replace GdkDeviceManager usage for GdkSeat.
+ For GTK4 further changes will be needed but this is a
+ start.
+
+ * UIProcess/gtk/ViewGestureControllerGtk.cpp:
+ (WebKit::createScrollEvent):
+
2020-04-08 Carlos Garcia Campos <[email protected]>
Ensure base cache path exists before calculating disk cache capacity
Modified: trunk/Source/WebKit/UIProcess/gtk/ViewGestureControllerGtk.cpp (259712 => 259713)
--- trunk/Source/WebKit/UIProcess/gtk/ViewGestureControllerGtk.cpp 2020-04-08 10:29:49 UTC (rev 259712)
+++ trunk/Source/WebKit/UIProcess/gtk/ViewGestureControllerGtk.cpp 2020-04-08 12:25:08 UTC (rev 259713)
@@ -535,9 +535,11 @@
event->scroll.is_stop = !xDelta && !yDelta;
event->scroll.window = GDK_WINDOW(g_object_ref(window));
gdk_event_set_screen(event.get(), gdk_window_get_screen(window));
- gdk_event_set_device(event.get(), gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gdk_window_get_display(window))));
- gdk_event_set_source_device(event.get(), gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gdk_window_get_display(window))));
+ GdkDevice* pointer = gdk_seat_get_pointer(gdk_display_get_default_seat(gdk_window_get_display(window)));
+ gdk_event_set_device(event.get(), pointer);
+ gdk_event_set_source_device(event.get(), pointer);
+
return event;
}
Modified: trunk/Tools/ChangeLog (259712 => 259713)
--- trunk/Tools/ChangeLog 2020-04-08 10:29:49 UTC (rev 259712)
+++ trunk/Tools/ChangeLog 2020-04-08 12:25:08 UTC (rev 259713)
@@ -1,3 +1,30 @@
+2020-04-08 Claudio Saavedra <[email protected]>
+
+ [GTK] Drop usage of deprecated GdkDeviceManager
+ https://bugs.webkit.org/show_bug.cgi?id=210179
+
+ Reviewed by Adrian Perez de Castro.
+
+ Replace GdkDeviceManager usage for GdkSeat.
+ For GTK4 further changes will be needed but this is a
+ start.
+
+ * TestWebKitAPI/glib/WebKitGLib/gtk/WebViewTestGtk.cpp:
+ (WebViewTest::mouseMoveTo):
+ (WebViewTest::keyStroke):
+ (WebViewTest::doMouseButtonEvent):
+ * TestWebKitAPI/gtk/PlatformWebViewGtk.cpp:
+ (TestWebKitAPI::doKeyStroke):
+ (TestWebKitAPI::doMouseButtonEvent):
+ (TestWebKitAPI::PlatformWebView::simulateMouseMove):
+ * WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
+ (WTR::EventSenderProxy::createMouseButtonEvent):
+ (WTR::EventSenderProxy::keyDown):
+ (WTR::EventSenderProxy::mouseMoveTo):
+ (WTR::EventSenderProxy::mouseScrollBy):
+ (WTR::EventSenderProxy::continuousMouseScrollBy):
+ (WTR::EventSenderProxy::createTouchEvent):
+
2020-04-08 Keith Rollin <[email protected]>
Enable the use of XCBuild by default in Apple builds
Modified: trunk/Tools/TestWebKitAPI/glib/WebKitGLib/gtk/WebViewTestGtk.cpp (259712 => 259713)
--- trunk/Tools/TestWebKitAPI/glib/WebKitGLib/gtk/WebViewTestGtk.cpp 2020-04-08 10:29:49 UTC (rev 259712)
+++ trunk/Tools/TestWebKitAPI/glib/WebKitGLib/gtk/WebViewTestGtk.cpp 2020-04-08 12:25:08 UTC (rev 259713)
@@ -104,7 +104,7 @@
event->motion.time = GDK_CURRENT_TIME;
event->motion.window = gtk_widget_get_window(viewWidget);
g_object_ref(event->motion.window);
- event->motion.device = gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gtk_widget_get_display(viewWidget)));
+ event->motion.device = gdk_seat_get_pointer(gdk_display_get_default_seat(gtk_widget_get_display(viewWidget)));
event->motion.state = mouseModifiers;
event->motion.axes = 0;
@@ -142,7 +142,7 @@
event->key.time = GDK_CURRENT_TIME;
event->key.window = gtk_widget_get_window(viewWidget);
g_object_ref(event->key.window);
- gdk_event_set_device(event.get(), gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gtk_widget_get_display(viewWidget))));
+ gdk_event_set_device(event.get(), gdk_seat_get_pointer(gdk_display_get_default_seat(gtk_widget_get_display(viewWidget))));
event->key.state = keyModifiers;
// When synthesizing an event, an invalid hardware_keycode value can cause it to be badly processed by GTK+.
@@ -173,7 +173,7 @@
event->button.state = mouseModifiers;
event->button.button = button;
- event->button.device = gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gtk_widget_get_display(viewWidget)));
+ event->button.device = gdk_seat_get_pointer(gdk_display_get_default_seat(gtk_widget_get_display(viewWidget)));
int xRoot, yRoot;
gdk_window_get_root_coords(gtk_widget_get_window(viewWidget), x, y, &xRoot, &yRoot);
Modified: trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp (259712 => 259713)
--- trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp 2020-04-08 10:29:49 UTC (rev 259712)
+++ trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp 2020-04-08 12:25:08 UTC (rev 259713)
@@ -90,7 +90,7 @@
event->key.state = 0;
event->key.window = gtk_widget_get_window(viewWidget);
g_object_ref(event->key.window);
- gdk_event_set_device(event.get(), gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gtk_widget_get_display(viewWidget))));
+ gdk_event_set_device(event.get(), gdk_seat_get_pointer(gdk_display_get_default_seat(gtk_widget_get_display(viewWidget))));
// When synthesizing an event, an invalid hardware_keycode value can cause it to be badly processed by GTK+.
GUniqueOutPtr<GdkKeymapKey> keys;
@@ -130,7 +130,7 @@
event->button.state = 0;
event->button.window = gtk_widget_get_window(viewWidget);
g_object_ref(event->button.window);
- event->button.device = gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gtk_widget_get_display(viewWidget)));
+ event->button.device = gdk_seat_get_pointer(gdk_display_get_default_seat(gtk_widget_get_display(viewWidget)));
int xRoot, yRoot;
gdk_window_get_root_coords(gtk_widget_get_window(viewWidget), x, y, &xRoot, &yRoot);
@@ -162,7 +162,7 @@
gtk_widget_show(m_window);
event->motion.window = gtk_widget_get_window(viewWidget);
g_object_ref(event->motion.window);
- event->motion.device = gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gtk_widget_get_display(viewWidget)));
+ event->motion.device = gdk_seat_get_pointer(gdk_display_get_default_seat(gtk_widget_get_display(viewWidget)));
int xRoot, yRoot;
gdk_window_get_root_coords(gtk_widget_get_window(viewWidget), x, y, &xRoot, &yRoot);
Modified: trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp (259712 => 259713)
--- trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp 2020-04-08 10:29:49 UTC (rev 259712)
+++ trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp 2020-04-08 12:25:08 UTC (rev 259713)
@@ -127,7 +127,7 @@
mouseEvent->button.y = m_position.y;
mouseEvent->button.window = gtk_widget_get_window(GTK_WIDGET(m_testController->mainWebView()->platformView()));
g_object_ref(mouseEvent->button.window);
- gdk_event_set_device(mouseEvent, gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gdk_window_get_display(mouseEvent->button.window))));
+ gdk_event_set_device(mouseEvent, gdk_seat_get_pointer(gdk_display_get_default_seat(gdk_window_get_display(mouseEvent->button.window))));
mouseEvent->button.state = webkitModifiersToGDKModifiers(modifiers) | m_mouseButtonsCurrentlyDown;
mouseEvent->button.time = GDK_CURRENT_TIME;
mouseEvent->button.axes = 0;
@@ -303,7 +303,7 @@
pressEvent->key.state = modifiers;
pressEvent->key.window = gtk_widget_get_window(GTK_WIDGET(m_testController->mainWebView()->platformWindow()));
g_object_ref(pressEvent->key.window);
- gdk_event_set_device(pressEvent, gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gdk_window_get_display(pressEvent->key.window))));
+ gdk_event_set_device(pressEvent, gdk_seat_get_pointer(gdk_display_get_default_seat(gdk_window_get_display(pressEvent->key.window))));
GUniqueOutPtr<GdkKeymapKey> keys;
gint nKeys;
@@ -374,7 +374,7 @@
event->motion.time = GDK_CURRENT_TIME;
event->motion.window = gtk_widget_get_window(GTK_WIDGET(m_testController->mainWebView()->platformView()));
g_object_ref(event->motion.window);
- gdk_event_set_device(event, gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gdk_window_get_display(event->motion.window))));
+ gdk_event_set_device(event, gdk_seat_get_pointer(gdk_display_get_default_seat(gdk_window_get_display(event->motion.window))));
event->motion.state = m_mouseButtonsCurrentlyDown;
event->motion.axes = 0;
@@ -398,7 +398,7 @@
event->scroll.time = GDK_CURRENT_TIME;
event->scroll.window = gtk_widget_get_window(GTK_WIDGET(m_testController->mainWebView()->platformView()));
g_object_ref(event->scroll.window);
- gdk_event_set_device(event, gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gdk_window_get_display(event->scroll.window))));
+ gdk_event_set_device(event, gdk_seat_get_pointer(gdk_display_get_default_seat(gdk_window_get_display(event->scroll.window))));
// For more than one tick in a scroll, we need smooth scroll event
if ((horizontal && vertical) || horizontal > 1 || horizontal < -1 || vertical > 1 || vertical < -1) {
@@ -438,7 +438,7 @@
event->scroll.time = GDK_CURRENT_TIME;
event->scroll.window = gtk_widget_get_window(GTK_WIDGET(m_testController->mainWebView()->platformView()));
g_object_ref(event->scroll.window);
- gdk_event_set_device(event, gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gdk_window_get_display(event->scroll.window))));
+ gdk_event_set_device(event, gdk_seat_get_pointer(gdk_display_get_default_seat(gdk_window_get_display(event->scroll.window))));
event->scroll.direction = GDK_SCROLL_SMOOTH;
event->scroll.delta_x = -horizontal / pixelsPerScrollTick;
@@ -481,7 +481,7 @@
touchEvent->touch.sequence = static_cast<GdkEventSequence*>(GINT_TO_POINTER(id));
touchEvent->touch.window = gtk_widget_get_window(GTK_WIDGET(m_testController->mainWebView()->platformView()));
g_object_ref(touchEvent->touch.window);
- gdk_event_set_device(touchEvent.get(), gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gdk_window_get_display(touchEvent->button.window))));
+ gdk_event_set_device(touchEvent.get(), gdk_seat_get_pointer(gdk_display_get_default_seat(gdk_window_get_display(touchEvent->button.window))));
touchEvent->touch.time = GDK_CURRENT_TIME;
return touchEvent;
