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

Bug 1923086 [Wayland] Set compositor crash handler r=emilio

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D224926
This commit is contained in:
stransky 2024-10-10 20:20:40 +00:00
parent 254711f85b
commit c51049416a
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
toolkit/xre/nsAppRunner.cpp
View File

@ -4751,6 +4751,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
if (!disableWaylandProxy && XRE_IsParentProcess() && waylandEnabled) { if (!disableWaylandProxy && XRE_IsParentProcess() && waylandEnabled) {
auto* proxyLog = getenv("WAYLAND_PROXY_LOG"); auto* proxyLog = getenv("WAYLAND_PROXY_LOG");
WaylandProxy::SetVerbose(proxyLog && *proxyLog); WaylandProxy::SetVerbose(proxyLog && *proxyLog);
WaylandProxy::SetCompositorCrashHandler(WlCompositorCrashHandler);
gWaylandProxy = WaylandProxy::Create(); gWaylandProxy = WaylandProxy::Create();
if (gWaylandProxy) { if (gWaylandProxy) {
gWaylandProxy->RunThread(); gWaylandProxy->RunThread();

7
widget/gtk/nsWaylandDisplay.cpp
View File

@ -523,6 +523,13 @@ static void WlLogHandler(const char* format, va_list args) {
MOZ_CRASH_UNSAFE(error); MOZ_CRASH_UNSAFE(error);
} }
// TODO: Add compositor info
void WlCompositorCrashHandler() {
constexpr char error[] = "Compositor crashed";
gfxCriticalNote << "Wayland protocol error: " << error;
MOZ_CRASH_UNSAFE(error);
}
nsWaylandDisplay::nsWaylandDisplay(wl_display* aDisplay) nsWaylandDisplay::nsWaylandDisplay(wl_display* aDisplay)
: mThreadId(PR_GetCurrentThread()), mDisplay(aDisplay) { : mThreadId(PR_GetCurrentThread()), mDisplay(aDisplay) {
// GTK sets the log handler on display creation, thus we overwrite it here // GTK sets the log handler on display creation, thus we overwrite it here

1
widget/gtk/nsWaylandDisplay.h
View File

@ -120,6 +120,7 @@ class nsWaylandDisplay {
wl_display* WaylandDisplayGetWLDisplay(); wl_display* WaylandDisplayGetWLDisplay();
nsWaylandDisplay* WaylandDisplayGet(); nsWaylandDisplay* WaylandDisplayGet();
void WaylandDisplayRelease(); void WaylandDisplayRelease();
void WlCompositorCrashHandler();
} // namespace mozilla::widget } // namespace mozilla::widget