diff --git a/cmake/tools/SetupWebKit.cmake b/cmake/tools/SetupWebKit.cmake index c923ce2609..22f4ed8cfe 100644 --- a/cmake/tools/SetupWebKit.cmake +++ b/cmake/tools/SetupWebKit.cmake @@ -2,7 +2,7 @@ option(WEBKIT_VERSION "The version of WebKit to use") option(WEBKIT_LOCAL "If a local version of WebKit should be used instead of downloading") if(NOT WEBKIT_VERSION) - set(WEBKIT_VERSION 76798f7b2fb287ee9f1ecce98bae895a2d026d93) + set(WEBKIT_VERSION 0a0a3838e5fab36b579df26620237bb62ed6d950) endif() if(WEBKIT_LOCAL) diff --git a/src/bun.js/bindings/webcore/MessagePortChannel.cpp b/src/bun.js/bindings/webcore/MessagePortChannel.cpp index a4b5cf1343..92f82c67c6 100644 --- a/src/bun.js/bindings/webcore/MessagePortChannel.cpp +++ b/src/bun.js/bindings/webcore/MessagePortChannel.cpp @@ -39,14 +39,13 @@ Ref MessagePortChannel::create(MessagePortChannelRegistry& r } MessagePortChannel::MessagePortChannel(MessagePortChannelRegistry& registry, const MessagePortIdentifier& port1, const MessagePortIdentifier& port2) - : m_registry(registry) + : m_ports { port1, port2 } + , m_registry(registry) { relaxAdoptionRequirement(); - m_ports[0] = port1; m_processes[0] = port1.processIdentifier; m_entangledToProcessProtectors[0] = this; - m_ports[1] = port2; m_processes[1] = port2.processIdentifier; m_entangledToProcessProtectors[1] = this; diff --git a/src/bun.js/bindings/webcore/MessagePortIdentifier.h b/src/bun.js/bindings/webcore/MessagePortIdentifier.h index d7c70b627c..2615da8300 100644 --- a/src/bun.js/bindings/webcore/MessagePortIdentifier.h +++ b/src/bun.js/bindings/webcore/MessagePortIdentifier.h @@ -68,7 +68,7 @@ struct MessagePortIdentifierHash { }; template<> struct HashTraits : GenericHashTraits { - static WebCore::MessagePortIdentifier emptyValue() { return {}; } + static WebCore::MessagePortIdentifier emptyValue() { return { HashTraits::emptyValue(), HashTraits::emptyValue() }; } static void constructDeletedValue(WebCore::MessagePortIdentifier& slot) { new (NotNull, &slot.processIdentifier) WebCore::ProcessIdentifier(WTF::HashTableDeletedValue); } diff --git a/src/bun.js/bindings/webcore/PortIdentifier.h b/src/bun.js/bindings/webcore/PortIdentifier.h index 17e9516d02..b584438a99 100644 --- a/src/bun.js/bindings/webcore/PortIdentifier.h +++ b/src/bun.js/bindings/webcore/PortIdentifier.h @@ -30,6 +30,6 @@ namespace WebCore { enum class PortIdentifierType {}; -using PortIdentifier = LegacyNullableAtomicObjectIdentifier; +using PortIdentifier = AtomicObjectIdentifier; }