Title: [258923] trunk/Source/WebKit
- Revision
- 258923
- Author
- [email protected]
- Date
- 2020-03-24 11:57:29 -0700 (Tue, 24 Mar 2020)
Log Message
[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: trunk/Source/WebKit/ChangeLog (258922 => 258923)
--- trunk/Source/WebKit/ChangeLog 2020-03-24 18:28:40 UTC (rev 258922)
+++ trunk/Source/WebKit/ChangeLog 2020-03-24 18:57:29 UTC (rev 258923)
@@ -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-24 Daniel Bates <[email protected]>
Simplify characterRectsForRange() in WebPage::requestDocumentEditingContext()
Modified: trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (258922 => 258923)
--- trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2020-03-24 18:28:40 UTC (rev 258922)
+++ trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2020-03-24 18:57:29 UTC (rev 258923)
@@ -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
