Title: [259961] releases/WebKitGTK/webkit-2.28/Source/WebKit
- Revision
- 259961
- Author
- [email protected]
- Date
- 2020-04-12 06:03:59 -0700 (Sun, 12 Apr 2020)
Log Message
Merge r258923 - [GTK] Crash in WebKit::LayerTreeHost::LayerTreeHost with bubblewrap sandbox enabled
https://bugs.webkit.org/show_bug.cgi?id=209106
Patch by Michael Catanzaro <[email protected]> on 2020-03-24
Reviewed by Adrian Perez de Castro.
The bubblewrap sandbox is blocking access to WebKit's nested Wayland compositor. Apparently
nobody has ever tested the nested Wayland compositor with the sandbox enabled until now.
* UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
(WebKit::bindWayland):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog (259960 => 259961)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-04-12 13:03:55 UTC (rev 259960)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-04-12 13:03:59 UTC (rev 259961)
@@ -1,3 +1,16 @@
+2020-03-24 Michael Catanzaro <[email protected]>
+
+ [GTK] Crash in WebKit::LayerTreeHost::LayerTreeHost with bubblewrap sandbox enabled
+ https://bugs.webkit.org/show_bug.cgi?id=209106
+
+ Reviewed by Adrian Perez de Castro.
+
+ The bubblewrap sandbox is blocking access to WebKit's nested Wayland compositor. Apparently
+ nobody has ever tested the nested Wayland compositor with the sandbox enabled until now.
+
+ * UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
+ (WebKit::bindWayland):
+
2020-03-12 Adrian Perez de Castro <[email protected]>
Unreviewed. Update OptionsWPE.cmake and NEWS for the 2.28.0 release
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (259960 => 259961)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2020-04-12 13:03:55 UTC (rev 259960)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2020-04-12 13:03:59 UTC (rev 259961)
@@ -31,6 +31,10 @@
#include <wtf/glib/GUniquePtr.h>
#if PLATFORM(GTK)
+#include "WaylandCompositor.h"
+#endif
+
+#if PLATFORM(GTK)
#define BASE_DIRECTORY "webkitgtk"
#elif PLATFORM(WPE)
#define BASE_DIRECTORY "wpe"
@@ -330,6 +334,12 @@
const char* runtimeDir = g_get_user_runtime_dir();
GUniquePtr<char> waylandRuntimeFile(g_build_filename(runtimeDir, display, nullptr));
bindIfExists(args, waylandRuntimeFile.get(), BindFlags::ReadWrite);
+
+#if PLATFORM(GTK) && !USE(WPE_RENDERER)
+ String displayName = WaylandCompositor::singleton().displayName();
+ waylandRuntimeFile.reset(g_build_filename(runtimeDir, displayName.utf8().data(), nullptr));
+ bindIfExists(args, waylandRuntimeFile.get(), BindFlags::ReadWrite);
+#endif
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
