You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
86 lines
3.0 KiB
86 lines
3.0 KiB
diff -aru a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp
|
|
--- a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2021-02-26 04:57:15.000000000 -0500
|
|
+++ b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2021-05-16 14:45:32.000000000 -0400
|
|
@@ -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;
|
|
diff -aru a/Source/WebKit/Platform/IPC/IPCSemaphore.cpp b/Source/WebKit/Platform/IPC/IPCSemaphore.cpp
|
|
--- a/Source/WebKit/Platform/IPC/IPCSemaphore.cpp 2021-02-26 04:57:15.000000000 -0500
|
|
+++ b/Source/WebKit/Platform/IPC/IPCSemaphore.cpp 2021-05-16 15:54:53.000000000 -0400
|
|
@@ -26,8 +26,6 @@
|
|
#include "config.h"
|
|
#include "IPCSemaphore.h"
|
|
|
|
-#if !OS(DARWIN)
|
|
-
|
|
namespace IPC {
|
|
|
|
Semaphore::Semaphore() = default;
|
|
@@ -46,5 +44,3 @@
|
|
}
|
|
|
|
}
|
|
-
|
|
-#endif
|
|
diff -aru a/Source/WebKit/Platform/IPC/IPCSemaphore.h b/Source/WebKit/Platform/IPC/IPCSemaphore.h
|
|
--- a/Source/WebKit/Platform/IPC/IPCSemaphore.h 2021-02-26 04:57:15.000000000 -0500
|
|
+++ b/Source/WebKit/Platform/IPC/IPCSemaphore.h 2021-05-16 14:46:13.000000000 -0400
|
|
@@ -29,7 +29,7 @@
|
|
#include <wtf/Optional.h>
|
|
#include <wtf/Seconds.h>
|
|
|
|
-#if OS(DARWIN)
|
|
+#if PLATFORM(COCOA)
|
|
#include <mach/semaphore.h>
|
|
#include <wtf/MachSendRight.h>
|
|
#endif
|
|
@@ -51,7 +51,7 @@
|
|
void encode(Encoder&) const;
|
|
static Optional<Semaphore> decode(Decoder&);
|
|
|
|
-#if OS(DARWIN)
|
|
+#if PLATFORM(COCOA)
|
|
explicit Semaphore(MachSendRight&&);
|
|
|
|
void signal();
|
|
@@ -64,7 +64,7 @@
|
|
#endif
|
|
|
|
private:
|
|
-#if OS(DARWIN)
|
|
+#if PLATFORM(COCOA)
|
|
void destroy();
|
|
MachSendRight m_sendRight;
|
|
semaphore_t m_semaphore { SEMAPHORE_NULL };
|
|
Only in b/Source/WebKit/Platform/IPC: IPCSemaphore.h.orig
|
|
diff -aru a/Source/WebKit/Platform/SharedMemory.h b/Source/WebKit/Platform/SharedMemory.h
|
|
--- a/Source/WebKit/Platform/SharedMemory.h 2021-02-26 04:57:15.000000000 -0500
|
|
+++ b/Source/WebKit/Platform/SharedMemory.h 2021-05-16 14:45:32.000000000 -0400
|
|
@@ -75,7 +75,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
|
|
|
|
diff -aru a/Source/WebKit/UIProcess/VisitedLinkStore.cpp b/Source/WebKit/UIProcess/VisitedLinkStore.cpp
|
|
--- a/Source/WebKit/UIProcess/VisitedLinkStore.cpp 2021-02-26 04:57:16.000000000 -0500
|
|
+++ b/Source/WebKit/UIProcess/VisitedLinkStore.cpp 2021-05-16 14:45:32.000000000 -0400
|
|
@@ -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;
|
|
Only in b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics: DrawingAreaCoordinatedGraphics.cpp.orig
|
|
|