From 548997b639ddbf020578bfa11e14cb00853c0a3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 8 Apr 2022 13:28:07 +0000
Subject: [PATCH] Bug 1763184 - Remove unreachable special-case in
 ScreenGetterGTK. r=stransky

Gnome on Wayland uses ScreenGetterWayland, so the special-case can be
removed.

Depends on D142963

Differential Revision: https://phabricator.services.mozilla.com/D142964
---
 widget/gtk/ScreenHelperGTK.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/widget/gtk/ScreenHelperGTK.cpp b/widget/gtk/ScreenHelperGTK.cpp
index 07ac1b88bbd5..f0c3eb46acb9 100644
--- a/widget/gtk/ScreenHelperGTK.cpp
+++ b/widget/gtk/ScreenHelperGTK.cpp
@@ -144,12 +144,8 @@ static already_AddRefed<Screen> MakeScreenGtk(GdkScreen* aScreen,
 
   // gdk_screen_get_monitor_geometry / workarea returns application pixels
   // (desktop pixels), so we need to convert it to device pixels with
-  // gdkScaleFactor on X11.
-  // GNOME/Wayland reports scales differently (Bug 1732682).
-  gint geometryScaleFactor = 1;
-  if (GdkIsX11Display() || (GdkIsWaylandDisplay() && !IsGNOMECompositor())) {
-    geometryScaleFactor = gdkScaleFactor;
-  }
+  // gdkScaleFactor.
+  gint geometryScaleFactor = gdkScaleFactor;
 
   LayoutDeviceIntRect rect;