Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1828070 [Wayland] Add logging to WidgetUtilsGtk / XDG token code r=emilio

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D175466
This commit is contained in:
stransky 2023-04-17 08:23:17 +00:00
parent 6a937b9474
commit 162cfdc993
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
widget/gtk/WidgetUtilsGtk.cpp
View File

@ -28,6 +28,7 @@
#include <dlfcn.h>
#include <glib.h>
#undef LOGW
#ifdef MOZ_LOGGING
# include "mozilla/Logging.h"
extern mozilla::LazyLogModule gWidgetLog;
@ -247,9 +248,11 @@ static gboolean token_failed(gpointer aData);
class XDGTokenRequest {
public:
void SetTokenID(const char* aTokenID) {
LOGW("RequestWaylandFocusPromise() SetTokenID %s", aTokenID);
mTransferPromise->Resolve(aTokenID, __func__);
}
void Cancel() {
LOGW("RequestWaylandFocusPromise() canceled");
mTransferPromise->Reject(false, __func__);
mActivationTimeoutID = 0;
}
@ -297,16 +300,19 @@ static const struct xdg_activation_token_v1_listener token_listener = {
RefPtr<FocusRequestPromise> RequestWaylandFocusPromise() {
#ifdef MOZ_WAYLAND
if (!GdkIsWaylandDisplay() || !KeymapWrapper::GetSeat()) {
LOGW("RequestWaylandFocusPromise() failed.");
return nullptr;
}
RefPtr<nsWindow> sourceWindow = nsWindow::GetFocusedWindow();
if (!sourceWindow || sourceWindow->IsDestroyed()) {
LOGW("RequestWaylandFocusPromise() missing source window");
return nullptr;
}
xdg_activation_v1* xdg_activation = WaylandDisplayGet()->GetXdgActivation();
if (!xdg_activation) {
LOGW("RequestWaylandFocusPromise() missing xdg_activation");
return nullptr;
}
@ -314,6 +320,7 @@ RefPtr<FocusRequestPromise> RequestWaylandFocusPromise() {
uint32_t focusSerial;
KeymapWrapper::GetFocusInfo(&focusSurface, &focusSerial);
if (!focusSurface) {
LOGW("RequestWaylandFocusPromise() missing focusSurface");
return nullptr;
}
@ -323,6 +330,7 @@ RefPtr<FocusRequestPromise> RequestWaylandFocusPromise() {
}
wl_surface* surface = gdk_wayland_window_get_wl_surface(gdkWindow);
if (focusSurface != surface) {
LOGW("RequestWaylandFocusPromise() missing wl_surface");
return nullptr;
}
@ -339,6 +347,8 @@ RefPtr<FocusRequestPromise> RequestWaylandFocusPromise() {
xdg_activation_token_v1_set_surface(aXdgToken, focusSurface);
xdg_activation_token_v1_commit(aXdgToken);
LOGW("RequestWaylandFocusPromise() XDG Token sent");
return transferPromise.forget();
#else // !defined(MOZ_WAYLAND)
return nullptr;