Title: [268914] releases/WebKitGTK/webkit-2.30/Source/WebKit
- Revision
- 268914
- Author
- carlo...@webkit.org
- Date
- 2020-10-23 01:26:00 -0700 (Fri, 23 Oct 2020)
Log Message
Merge r268472 - [GLIB] Fix linking error for systems not providing <sys/memfd.h>
https://bugs.webkit.org/show_bug.cgi?id=217514
Reviewed by Carlos Garcia Campos.
* UIProcess/Launcher/glib/BubblewrapLauncher.cpp: Unconditionally check for <sys/mman.h> which should always exist instead
of <sys/memfd.h>. Also define the fallback with syscall() only for linux systems (as it requires <linux/memfd.h>).
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog (268913 => 268914)
--- releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog 2020-10-23 08:25:56 UTC (rev 268913)
+++ releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog 2020-10-23 08:26:00 UTC (rev 268914)
@@ -1,3 +1,13 @@
+2020-10-14 Sergio Villar Senin <svil...@igalia.com>
+
+ [GLIB] Fix linking error for systems not providing <sys/memfd.h>
+ https://bugs.webkit.org/show_bug.cgi?id=217514
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/Launcher/glib/BubblewrapLauncher.cpp: Unconditionally check for <sys/mman.h> which should always exist instead
+ of <sys/memfd.h>. Also define the fallback with syscall() only for linux systems (as it requires <linux/memfd.h>).
+
2020-10-15 Chris Lord <cl...@igalia.com>
[GTK][WPE] Add support for smooth scrolling animation with async scrolling
Modified: releases/WebKitGTK/webkit-2.30/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (268913 => 268914)
--- releases/WebKitGTK/webkit-2.30/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2020-10-23 08:25:56 UTC (rev 268913)
+++ releases/WebKitGTK/webkit-2.30/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2020-10-23 08:26:00 UTC (rev 268914)
@@ -40,12 +40,14 @@
#define BASE_DIRECTORY "wpe"
#endif
-#if __has_include(<sys/memfd.h>)
+#include <sys/mman.h>
-#include <sys/memfd.h>
+#ifndef MFD_ALLOW_SEALING
-#else
+#if HAVE(LINUX_MEMFD_H)
+#include <linux/memfd.h>
+
// These defines were added in glibc 2.27, the same release that added memfd_create.
// But the kernel added all of this in Linux 3.17. So it's totally safe for us to
// depend on, as long as we define it all ourselves. Remove this once we depend on
@@ -59,14 +61,14 @@
#define F_SEAL_GROW 0x0004
#define F_SEAL_WRITE 0x0008
-#define MFD_ALLOW_SEALING 2U
-
static int memfd_create(const char* name, unsigned flags)
{
return syscall(__NR_memfd_create, name, flags);
}
-#endif
+#endif // #if HAVE(LINUX_MEMFD_H)
+#endif // #ifndef MFD_ALLOW_SEALING
+
namespace WebKit {
using namespace WebCore;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
