Changeset 260750 in webkit

Timestamp:

Apr 27, 2020 4:52:10 AM (4 years ago)

Author:

berto@igalia.com

Message:

[GTK] [2.28.0] The Yelp build crashes if DISPLAY is not set
​https://bugs.webkit.org/show_bug.cgi?id=209431

Reviewed by Carlos Garcia Campos.

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

• platform/graphics/PlatformDisplay.cpp:

(WebCore::PlatformDisplay::createPlatformDisplay):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/PlatformDisplay.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-27  Alberto Garcia  <berto@igalia.com>
+
+        [GTK] [2.28.0] The Yelp build crashes if DISPLAY is not set
+        https://bugs.webkit.org/show_bug.cgi?id=209431
+
+        Reviewed by Carlos Garcia Campos.
+
+        Don't create a PlatformDisplayLibWPE as a fallback when using
+        Wayland or X11.
+
+        * platform/graphics/PlatformDisplay.cpp:
+        (WebCore::PlatformDisplay::createPlatformDisplay):
+
 2020-04-27  Claudio Saavedra  <csaavedra@igalia.com>
 

trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp

@@ -99 +99 @@
 #endif // PLATFORM(GTK)
 
+#if PLATFORM(WAYLAND)
+    if (auto platformDisplay = PlatformDisplayWayland::create())
+        return platformDisplay;
+#endif
+
+#if PLATFORM(X11)
+    if (auto platformDisplay = PlatformDisplayX11::create())
+        return platformDisplay;
+#endif
+
+    // If at this point we still don't have a display, just create a fake display with no native.
+#if PLATFORM(WAYLAND)
+    return PlatformDisplayWayland::create(nullptr);
+#elif PLATFORM(X11)
+    return PlatformDisplayX11::create(nullptr);
+#endif
+
 #if USE(WPE_RENDERER)
     return PlatformDisplayLibWPE::create();
 #elif PLATFORM(WIN)
     return PlatformDisplayWin::create();
-#endif
-
-#if PLATFORM(WAYLAND)
-    if (auto platformDisplay = PlatformDisplayWayland::create())
-        return platformDisplay;
-#endif
-
-#if PLATFORM(X11)
-    if (auto platformDisplay = PlatformDisplayX11::create())
-        return platformDisplay;
-#endif
-
-    // If at this point we still don't have a display, just create a fake display with no native.
-#if PLATFORM(WAYLAND)
-    return PlatformDisplayWayland::create(nullptr);
-#elif PLATFORM(X11)
-    return PlatformDisplayX11::create(nullptr);
 #endif