From 52d2e69d269e39947d10c68203d32f82a3153cf5 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Date: Mon, 27 Apr 2020 13:55:16 +0100 Subject: [PATCH] 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 --- Source/WebCore/platform/graphics/PlatformDisplay.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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::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::createPlatformDisplay() return PlatformDisplayX11::create(nullptr); #endif +#if USE(WPE_RENDERER) + return PlatformDisplayLibWPE::create(); +#elif PLATFORM(WIN) + return PlatformDisplayWin::create(); +#endif + RELEASE_ASSERT_NOT_REACHED(); } -- 2.30.2