From dca8b9611ffeaf7c71bc3e15201aac8657bea75d Mon Sep 17 00:00:00 2001
From: stransky <stransky@redhat.com>
Date: Mon, 8 Mar 2021 21:26:19 +0000
Subject: [PATCH] Bug 1696937 [Linux] Remove wayland/drm info from
 about:support, r=jhorak

We can't get meaningful drm info at about:config as the info gathered too early and GfxPlatformGtk() is not initialized yet.

Differential Revision: https://phabricator.services.mozilla.com/D107502
---
 toolkit/crashreporter/CrashAnnotations.yaml |  5 -----
 widget/GfxInfoX11.cpp                       | 16 +---------------
 widget/GfxInfoX11.h                         |  1 -
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/toolkit/crashreporter/CrashAnnotations.yaml b/toolkit/crashreporter/CrashAnnotations.yaml
index 78ce2e1880f9..310a0417025b 100644
--- a/toolkit/crashreporter/CrashAnnotations.yaml
+++ b/toolkit/crashreporter/CrashAnnotations.yaml
@@ -548,11 +548,6 @@ IsWayland:
     If true then the Wayland windowing system was in use.
   type: boolean
 
-IsWaylandDRM:
-  description: >
-    If true then the Wayland DRM backend was in use.
-  type: boolean
-
 IsWebRenderResourcePathOverridden:
   description: >
     If true then the WebRender resources (i.e. shaders) are loaded from a user specified path.
diff --git a/widget/GfxInfoX11.cpp b/widget/GfxInfoX11.cpp
index ac8838282a88..7ef60878ad60 100644
--- a/widget/GfxInfoX11.cpp
+++ b/widget/GfxInfoX11.cpp
@@ -52,7 +52,6 @@ nsresult GfxInfo::Init() {
   mIsMesa = false;
   mIsAccelerated = true;
   mIsWayland = false;
-  mIsWaylandDRM = false;
   mIsXWayland = false;
   mHasMultipleGPUs = false;
   mGlxTestError = false;
@@ -70,8 +69,6 @@ void GfxInfo::AddCrashReportAnnotations() {
       CrashReporter::Annotation::AdapterDriverVersion, mDriverVersion);
   CrashReporter::AnnotateCrashReport(CrashReporter::Annotation::IsWayland,
                                      mIsWayland);
-  CrashReporter::AnnotateCrashReport(CrashReporter::Annotation::IsWaylandDRM,
-                                     mIsWaylandDRM);
   CrashReporter::AnnotateCrashReport(
       CrashReporter::Annotation::DesktopEnvironment, mDesktopEnvironment);
 
@@ -464,11 +461,6 @@ void GfxInfo::GetData() {
 #ifdef MOZ_WAYLAND
   mIsWayland = gdk_display_get_default() &&
                !GDK_IS_X11_DISPLAY(gdk_display_get_default());
-  if (mIsWayland) {
-    mIsWaylandDRM = GetDMABufDevice()->IsDMABufVAAPIEnabled() ||
-                    GetDMABufDevice()->IsDMABufWebGLEnabled() ||
-                    GetDMABufDevice()->IsDMABufTexturesEnabled();
-  }
 #endif
 
   // Make a best effort guess at whether or not we are using the XWayland compat
@@ -991,13 +983,7 @@ NS_IMETHODIMP
 GfxInfo::GetWindowProtocol(nsAString& aWindowProtocol) {
   GetData();
   if (mIsWayland) {
-    if (mIsWaylandDRM) {
-      aWindowProtocol =
-          GfxDriverInfo::GetWindowProtocol(WindowProtocol::WaylandDRM);
-    } else {
-      aWindowProtocol =
-          GfxDriverInfo::GetWindowProtocol(WindowProtocol::Wayland);
-    }
+    aWindowProtocol = GfxDriverInfo::GetWindowProtocol(WindowProtocol::Wayland);
   } else if (mIsXWayland) {
     aWindowProtocol =
         GfxDriverInfo::GetWindowProtocol(WindowProtocol::XWayland);
diff --git a/widget/GfxInfoX11.h b/widget/GfxInfoX11.h
index 879ab702df7f..12e3a5c22d9b 100644
--- a/widget/GfxInfoX11.h
+++ b/widget/GfxInfoX11.h
@@ -109,7 +109,6 @@ class GfxInfo final : public GfxInfoBase {
   bool mIsMesa;
   bool mIsAccelerated;
   bool mIsWayland;
-  bool mIsWaylandDRM;
   bool mIsXWayland;
   bool mHasMultipleGPUs;
   bool mGlxTestError;