Diff
Modified: trunk/Source/WTF/ChangeLog (282060 => 282061)
--- trunk/Source/WTF/ChangeLog 2021-09-06 17:49:10 UTC (rev 282060)
+++ trunk/Source/WTF/ChangeLog 2021-09-06 18:42:42 UTC (rev 282061)
@@ -1,3 +1,14 @@
+2021-09-06 Dmitry Kalinkin <[email protected]>
+
+ Fix WebKitGTK build on MacOS
+ https://bugs.webkit.org/show_bug.cgi?id=225850
+
+ Reviewed by Michael Catanzaro.
+
+ Define HAVE_AUDIT_TOKEN only for Cocoa backend.
+
+ * wtf/PlatformHave.h:
+
2021-09-03 Basuke Suzuki <[email protected]>
Use USE(SYSTEM_MALLOC) macro in all cases
Modified: trunk/Source/WTF/wtf/PlatformHave.h (282060 => 282061)
--- trunk/Source/WTF/wtf/PlatformHave.h 2021-09-06 17:49:10 UTC (rev 282060)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2021-09-06 18:42:42 UTC (rev 282061)
@@ -53,6 +53,10 @@
#endif
#if PLATFORM(COCOA)
+#define HAVE_AUDIT_TOKEN 1
+#endif
+
+#if PLATFORM(COCOA)
#define HAVE_OUT_OF_PROCESS_LAYER_HOSTING 1
#endif
@@ -206,10 +210,6 @@
#define HAVE_SYS_TIMEB_H 1
#endif
-#if OS(DARWIN)
-#define HAVE_AUDIT_TOKEN 1
-#endif
-
#if OS(DARWIN) && __has_include(<mach/mach_exc.defs>) && !PLATFORM(GTK)
#define HAVE_MACH_EXCEPTIONS 1
#endif
Modified: trunk/Source/WebKit/ChangeLog (282060 => 282061)
--- trunk/Source/WebKit/ChangeLog 2021-09-06 17:49:10 UTC (rev 282060)
+++ trunk/Source/WebKit/ChangeLog 2021-09-06 18:42:42 UTC (rev 282061)
@@ -1,3 +1,21 @@
+2021-09-06 Dmitry Kalinkin <[email protected]>
+
+ Fix WebKitGTK build on MacOS
+ https://bugs.webkit.org/show_bug.cgi?id=225850
+
+ Reviewed by Michael Catanzaro.
+
+ Define HAVE_AUDIT_TOKEN only for Cocoa backend.
+ Streamline other conditionals for consistency between headers and implementations.
+
+ * NetworkProcess/ServiceWorker/WebSWOriginStore.cpp:
+ (WebKit::WebSWOriginStore::sendStoreHandle):
+ * Platform/IPC/unix/ConnectionUnix.cpp:
+ * Platform/IPC/IPCSemaphore.h:
+ * Platform/SharedMemory.h:
+ * UIProcess/VisitedLinkStore.cpp:
+ (WebKit::VisitedLinkStore::sendStoreHandleToProcess):
+
2021-09-06 Youenn Fablet <[email protected]>
Implement libwebrtc network manager GetMdnsResponder
Modified: trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp (282060 => 282061)
--- trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2021-09-06 17:49:10 UTC (rev 282060)
+++ trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2021-09-06 18:42:42 UTC (rev 282061)
@@ -87,7 +87,7 @@
if (!m_store.createSharedMemoryHandle(handle))
return;
-#if OS(DARWIN) || OS(WINDOWS)
+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
uint64_t dataSize = handle.size();
#else
uint64_t dataSize = 0;
Modified: trunk/Source/WebKit/Platform/IPC/IPCSemaphore.h (282060 => 282061)
--- trunk/Source/WebKit/Platform/IPC/IPCSemaphore.h 2021-09-06 17:49:10 UTC (rev 282060)
+++ trunk/Source/WebKit/Platform/IPC/IPCSemaphore.h 2021-09-06 18:42:42 UTC (rev 282061)
@@ -29,7 +29,7 @@
#include <wtf/Noncopyable.h>
#include <wtf/Seconds.h>
-#if OS(DARWIN)
+#if PLATFORM(COCOA)
#include <mach/semaphore.h>
#include <wtf/MachSendRight.h>
#elif OS(WINDOWS)
@@ -57,7 +57,7 @@
bool wait();
bool waitFor(Timeout);
-#if OS(DARWIN)
+#if PLATFORM(COCOA)
explicit Semaphore(MachSendRight&&);
MachSendRight createSendRight() const;
@@ -70,7 +70,7 @@
private:
void destroy();
-#if OS(DARWIN)
+#if PLATFORM(COCOA)
MachSendRight m_sendRight;
semaphore_t m_semaphore { SEMAPHORE_NULL };
#elif OS(WINDOWS)
Modified: trunk/Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp (282060 => 282061)
--- trunk/Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp 2021-09-06 17:49:10 UTC (rev 282060)
+++ trunk/Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp 2021-09-06 18:42:42 UTC (rev 282061)
@@ -44,6 +44,10 @@
#include <gio/gio.h>
#endif
+#if OS(DARWIN)
+#define MSG_NOSIGNAL 0
+#endif
+
// Although it's available on Darwin, SOCK_SEQPACKET seems to work differently
// than in traditional Unix so fallback to STREAM on that platform.
#if defined(SOCK_SEQPACKET) && !OS(DARWIN)
Modified: trunk/Source/WebKit/Platform/SharedMemory.h (282060 => 282061)
--- trunk/Source/WebKit/Platform/SharedMemory.h 2021-09-06 17:49:10 UTC (rev 282060)
+++ trunk/Source/WebKit/Platform/SharedMemory.h 2021-09-06 18:42:42 UTC (rev 282061)
@@ -74,7 +74,7 @@
bool isNull() const;
-#if OS(DARWIN) || OS(WINDOWS)
+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
size_t size() const { return m_size; }
#endif
Modified: trunk/Source/WebKit/UIProcess/VisitedLinkStore.cpp (282060 => 282061)
--- trunk/Source/WebKit/UIProcess/VisitedLinkStore.cpp 2021-09-06 17:49:10 UTC (rev 282060)
+++ trunk/Source/WebKit/UIProcess/VisitedLinkStore.cpp 2021-09-06 18:42:42 UTC (rev 282061)
@@ -119,7 +119,7 @@
return;
// FIXME: Get the actual size of data being sent from m_linkHashStore and send it in the SharedMemory::IPCHandle object.
-#if OS(DARWIN) || OS(WINDOWS)
+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
uint64_t dataSize = handle.size();
#else
uint64_t dataSize = 0;
