From: Alberto Garcia <berto@igalia.com>
Date: Thu, 7 May 2020 10:47:16 +0000 (+0100)
Subject: Don't create a PlatformDisplayLibWPE as a fallback when using Wayland or X11
X-Git-Tag: archive/raspbian/2.28.2-2_deb10u1+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=eaf2be627b4f109147d41391329218262a2bf4bd;p=webkit2gtk.git

Don't create a PlatformDisplayLibWPE as a fallback when using Wayland or X11

Origin: https://trac.webkit.org/changeset/260750
Bug: https://bugs.webkit.org/show_bug.cgi?id=209431
Bug-Debian: https://bugs.debian.org/956219

===================================================================

Gbp-Pq: Name dont-fallback-to-libwpe.patch
---

diff --git a/Source/WebCore/platform/graphics/PlatformDisplay.cpp b/Source/WebCore/platform/graphics/PlatformDisplay.cpp
index 156e5aa2b7..62bc146f13 100644
--- a/Source/WebCore/platform/graphics/PlatformDisplay.cpp
+++ b/Source/WebCore/platform/graphics/PlatformDisplay.cpp
@@ -90,12 +90,6 @@ std::unique_ptr<PlatformDisplay> PlatformDisplay::createPlatformDisplay()
     }
 #endif // PLATFORM(GTK)
 
-#if USE(WPE_RENDERER)
-    return PlatformDisplayLibWPE::create();
-#elif PLATFORM(WIN)
-    return PlatformDisplayWin::create();
-#endif
-
 #if PLATFORM(WAYLAND)
     if (auto platformDisplay = PlatformDisplayWayland::create())
         return platformDisplay;
@@ -113,6 +107,12 @@ std::unique_ptr<PlatformDisplay> PlatformDisplay::createPlatformDisplay()
     return PlatformDisplayX11::create(nullptr);
 #endif
 
+#if USE(WPE_RENDERER)
+    return PlatformDisplayLibWPE::create();
+#elif PLATFORM(WIN)
+    return PlatformDisplayWin::create();
+#endif
+
     RELEASE_ASSERT_NOT_REACHED();
 }