Title: [264080] releases/WebKitGTK/webkit-2.28/Source/WebCore
- Revision
- 264080
- Author
- [email protected]
- Date
- 2020-07-08 03:07:02 -0700 (Wed, 08 Jul 2020)
Log Message
Merge r260750 - [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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog (264079 => 264080)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-07-08 10:06:58 UTC (rev 264079)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-07-08 10:07:02 UTC (rev 264080)
@@ -1,3 +1,16 @@
+2020-04-27 Alberto Garcia <[email protected]>
+
+ [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-16 Carlos Alberto Lopez Perez <[email protected]>
[GTK] MiniBrowser opens new windows too small causing failures on some WPT tests
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/platform/graphics/PlatformDisplay.cpp (264079 => 264080)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2020-07-08 10:06:58 UTC (rev 264079)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2020-07-08 10:07:02 UTC (rev 264080)
@@ -90,12 +90,6 @@
}
#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 @@
return PlatformDisplayX11::create(nullptr);
#endif
+#if USE(WPE_RENDERER)
+ return PlatformDisplayLibWPE::create();
+#elif PLATFORM(WIN)
+ return PlatformDisplayWin::create();
+#endif
+
RELEASE_ASSERT_NOT_REACHED();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
