Don't create a PlatformDisplayLibWPE as a fallback when using Wayland or X11
authorAlberto Garcia <berto@igalia.com>
Thu, 7 May 2020 10:47:16 +0000 (11:47 +0100)
committerAlberto Garcia <berto@igalia.com>
Thu, 7 May 2020 10:47:16 +0000 (11:47 +0100)
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

index 156e5aa2b735df61a1c1966edb336b5dc19e0fbb..62bc146f136e34229c1f1bfe12dce38580a95d0e 100644 (file)
@@ -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();
 }