Diff
Modified: trunk/Source/WebKit2/ChangeLog (168582 => 168583)
--- trunk/Source/WebKit2/ChangeLog 2014-05-10 20:20:36 UTC (rev 168582)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-10 20:51:20 UTC (rev 168583)
@@ -1,5 +1,25 @@
2014-05-10 Anders Carlsson <[email protected]>
+ Simplify createDataAvailableSource
+ https://bugs.webkit.org/show_bug.cgi?id=132782
+ <rdar://problem/16815202>
+
+ Reviewed by Sam Weinig.
+
+ * Platform/IPC/mac/ConnectionMac.mm: Renamed from Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp.
+ Rename to make this Objective-C++ so we get the lambda-to-block conversion.
+
+ (IPC::createDataAvailableSource):
+ Make this a function template and just pass the function directly to dispatch_source_set_event_handler.
+
+ (IPC::Connection::open):
+ Use lambdas instead of WTF::bind, so we'll make sure the connection is kept alive.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Update for ConnectionMac.cpp to ConnectionMac.mm rename.
+
+2014-05-10 Anders Carlsson <[email protected]>
+
Follow-up fix.
Reviewed by Darin Adler.
Deleted: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp (168582 => 168583)
--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp 2014-05-10 20:20:36 UTC (rev 168582)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp 2014-05-10 20:51:20 UTC (rev 168583)
@@ -1,529 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "Connection.h"
-
-#include "DataReference.h"
-#include "ImportanceAssertion.h"
-#include "MachPort.h"
-#include "MachUtilities.h"
-#include <mach/mach_error.h>
-#include <mach/vm_map.h>
-#include <wtf/RunLoop.h>
-#include <xpc/xpc.h>
-
-#if __has_include(<xpc/private.h>)
-#include <xpc/private.h>
-#endif
-
-extern "C" void xpc_connection_get_audit_token(xpc_connection_t, audit_token_t*);
-
-namespace IPC {
-
-static const size_t inlineMessageMaxSize = 4096;
-
-// Message flags.
-enum {
- MessageBodyIsOutOfLine = 1 << 0
-};
-
-void Connection::platformInvalidate()
-{
- if (!m_isConnected)
- return;
-
- m_isConnected = false;
-
- ASSERT(m_sendPort);
- ASSERT(m_receivePort);
-
- // Unregister our ports.
- dispatch_source_cancel(m_deadNameSource);
- dispatch_release(m_deadNameSource);
- m_deadNameSource = 0;
- m_sendPort = MACH_PORT_NULL;
-
- dispatch_source_cancel(m_receivePortDataAvailableSource);
- dispatch_release(m_receivePortDataAvailableSource);
- m_receivePortDataAvailableSource = 0;
- m_receivePort = MACH_PORT_NULL;
-
-#if !PLATFORM(IOS)
- if (m_exceptionPort) {
- dispatch_source_cancel(m_exceptionPortDataAvailableSource);
- dispatch_release(m_exceptionPortDataAvailableSource);
- m_exceptionPortDataAvailableSource = 0;
- m_exceptionPort = MACH_PORT_NULL;
- }
-#endif
-
- if (m_xpcConnection) {
- xpc_release(m_xpcConnection);
- m_xpcConnection = 0;
- }
-}
-
-void Connection::platformInitialize(Identifier identifier)
-{
-#if !PLATFORM(IOS)
- m_exceptionPort = MACH_PORT_NULL;
- m_exceptionPortDataAvailableSource = nullptr;
-#endif
-
- if (m_isServer) {
- m_receivePort = identifier.port;
- m_sendPort = MACH_PORT_NULL;
- } else {
- m_receivePort = MACH_PORT_NULL;
- m_sendPort = identifier.port;
- }
-
- m_deadNameSource = nullptr;
- m_receivePortDataAvailableSource = nullptr;
-
- m_xpcConnection = identifier.xpcConnection;
- // FIXME: Instead of explicitly retaining the connection here, Identifier::xpcConnection
- // should just be a smart pointer.
- if (m_xpcConnection)
- xpc_retain(m_xpcConnection);
-}
-
-static dispatch_source_t createDataAvailableSource(mach_port_t receivePort, WorkQueue* workQueue, std::function<void ()> function)
-{
- dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV, receivePort, 0, workQueue->dispatchQueue());
- dispatch_source_set_event_handler(source, ^{
- function();
- });
-
- dispatch_source_set_cancel_handler(source, ^{
- mach_port_mod_refs(mach_task_self(), receivePort, MACH_PORT_RIGHT_RECEIVE, -1);
- });
-
- return source;
-}
-
-bool Connection::open()
-{
- if (m_isServer) {
- ASSERT(m_receivePort);
- ASSERT(!m_sendPort);
-
- } else {
- ASSERT(!m_receivePort);
- ASSERT(m_sendPort);
-
- // Create the receive port.
- mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &m_receivePort);
-
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
- mach_port_set_attributes(mach_task_self(), m_receivePort, MACH_PORT_IMPORTANCE_RECEIVER, (mach_port_info_t)0, 0);
-#endif
-
- m_isConnected = true;
-
- // Send the initialize message, which contains a send right for the server to use.
- auto encoder = std::make_unique<MessageEncoder>("IPC", "InitializeConnection", 0);
- encoder->encode(MachPort(m_receivePort, MACH_MSG_TYPE_MAKE_SEND));
-
- sendMessage(std::move(encoder));
-
- initializeDeadNameSource();
- }
-
- // Change the message queue length for the receive port.
- setMachPortQueueLength(m_receivePort, MACH_PORT_QLIMIT_LARGE);
-
- // Register the data available handler.
- m_receivePortDataAvailableSource = createDataAvailableSource(m_receivePort, m_connectionQueue.get(), bind(&Connection::receiveSourceEventHandler, this));
-
-#if !PLATFORM(IOS)
- // If we have an exception port, register the data available handler and send over the port to the other end.
- if (m_exceptionPort) {
- m_exceptionPortDataAvailableSource = createDataAvailableSource(m_exceptionPort, m_connectionQueue.get(), bind(&Connection::exceptionSourceEventHandler, this));
-
- auto encoder = std::make_unique<MessageEncoder>("IPC", "SetExceptionPort", 0);
- encoder->encode(MachPort(m_exceptionPort, MACH_MSG_TYPE_MAKE_SEND));
-
- sendMessage(std::move(encoder));
- }
-#endif
-
- ref();
- dispatch_async(m_connectionQueue->dispatchQueue(), ^{
- dispatch_resume(m_receivePortDataAvailableSource);
-
- if (m_deadNameSource)
- dispatch_resume(m_deadNameSource);
-#if !PLATFORM(IOS)
- if (m_exceptionPortDataAvailableSource)
- dispatch_resume(m_exceptionPortDataAvailableSource);
-#endif
-
- deref();
- });
-
- return true;
-}
-
-static inline size_t machMessageSize(size_t bodySize, size_t numberOfPortDescriptors = 0, size_t numberOfOOLMemoryDescriptors = 0)
-{
- size_t size = sizeof(mach_msg_header_t) + bodySize;
- if (numberOfPortDescriptors || numberOfOOLMemoryDescriptors) {
- size += sizeof(mach_msg_body_t);
- if (numberOfPortDescriptors)
- size += (numberOfPortDescriptors * sizeof(mach_msg_port_descriptor_t));
- if (numberOfOOLMemoryDescriptors)
- size += (numberOfOOLMemoryDescriptors * sizeof(mach_msg_ool_descriptor_t));
- }
- return round_msg(size);
-}
-
-bool Connection::platformCanSendOutgoingMessages() const
-{
- return true;
-}
-
-bool Connection::sendOutgoingMessage(std::unique_ptr<MessageEncoder> encoder)
-{
- Vector<Attachment> attachments = encoder->releaseAttachments();
-
- size_t numberOfPortDescriptors = 0;
- size_t numberOfOOLMemoryDescriptors = 0;
- for (size_t i = 0; i < attachments.size(); ++i) {
- Attachment::Type type = attachments[i].type();
- if (type == Attachment::MachPortType)
- numberOfPortDescriptors++;
- }
-
- size_t messageSize = machMessageSize(encoder->bufferSize(), numberOfPortDescriptors, numberOfOOLMemoryDescriptors);
-
- bool messageBodyIsOOL = false;
- if (messageSize > inlineMessageMaxSize) {
- messageBodyIsOOL = true;
-
- numberOfOOLMemoryDescriptors++;
- messageSize = machMessageSize(0, numberOfPortDescriptors, numberOfOOLMemoryDescriptors);
- }
-
- char stackBuffer[inlineMessageMaxSize];
- char* buffer = &stackBuffer[0];
- if (messageSize > inlineMessageMaxSize)
- buffer = (char*)mmap(0, messageSize, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
-
- bool isComplex = (numberOfPortDescriptors + numberOfOOLMemoryDescriptors > 0);
-
- mach_msg_header_t* header = reinterpret_cast<mach_msg_header_t*>(buffer);
- header->msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, 0);
- header->msgh_size = messageSize;
- header->msgh_remote_port = m_sendPort;
- header->msgh_local_port = MACH_PORT_NULL;
- header->msgh_id = 0;
- if (messageBodyIsOOL)
- header->msgh_id |= MessageBodyIsOutOfLine;
-
- uint8_t* messageData;
-
- if (isComplex) {
- header->msgh_bits |= MACH_MSGH_BITS_COMPLEX;
-
- mach_msg_body_t* body = reinterpret_cast<mach_msg_body_t*>(header + 1);
- body->msgh_descriptor_count = numberOfPortDescriptors + numberOfOOLMemoryDescriptors;
- uint8_t* descriptorData = reinterpret_cast<uint8_t*>(body + 1);
-
- for (size_t i = 0; i < attachments.size(); ++i) {
- Attachment attachment = attachments[i];
-
- mach_msg_descriptor_t* descriptor = reinterpret_cast<mach_msg_descriptor_t*>(descriptorData);
- switch (attachment.type()) {
- case Attachment::MachPortType:
- descriptor->port.name = attachment.port();
- descriptor->port.disposition = attachment.disposition();
- descriptor->port.type = MACH_MSG_PORT_DESCRIPTOR;
-
- descriptorData += sizeof(mach_msg_port_descriptor_t);
- break;
- default:
- ASSERT_NOT_REACHED();
- }
- }
-
- if (messageBodyIsOOL) {
- mach_msg_descriptor_t* descriptor = reinterpret_cast<mach_msg_descriptor_t*>(descriptorData);
-
- descriptor->out_of_line.address = encoder->buffer();
- descriptor->out_of_line.size = encoder->bufferSize();
- descriptor->out_of_line.copy = MACH_MSG_VIRTUAL_COPY;
- descriptor->out_of_line.deallocate = false;
- descriptor->out_of_line.type = MACH_MSG_OOL_DESCRIPTOR;
-
- descriptorData += sizeof(mach_msg_ool_descriptor_t);
- }
-
- messageData = descriptorData;
- } else
- messageData = (uint8_t*)(header + 1);
-
- // Copy the data if it is not being sent out-of-line.
- if (!messageBodyIsOOL)
- memcpy(messageData, encoder->buffer(), encoder->bufferSize());
-
- ASSERT(m_sendPort);
-
- // Send the message.
- kern_return_t kr = mach_msg(header, MACH_SEND_MSG, messageSize, 0, MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
- if (kr != KERN_SUCCESS) {
- // FIXME: What should we do here?
- }
-
- if (buffer != &stackBuffer[0])
- munmap(buffer, messageSize);
-
- return true;
-}
-
-void Connection::initializeDeadNameSource()
-{
- m_deadNameSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_SEND, m_sendPort, 0, m_connectionQueue->dispatchQueue());
- dispatch_source_set_event_handler(m_deadNameSource, bind(&Connection::connectionDidClose, this));
-
- mach_port_t sendPort = m_sendPort;
- dispatch_source_set_cancel_handler(m_deadNameSource, ^{
- // Release our send right.
- mach_port_deallocate(mach_task_self(), sendPort);
- });
-}
-
-static std::unique_ptr<MessageDecoder> createMessageDecoder(mach_msg_header_t* header)
-{
- if (!(header->msgh_bits & MACH_MSGH_BITS_COMPLEX)) {
- // We have a simple message.
- uint8_t* body = reinterpret_cast<uint8_t*>(header + 1);
- size_t bodySize = header->msgh_size - sizeof(mach_msg_header_t);
-
- return std::make_unique<MessageDecoder>(DataReference(body, bodySize), Vector<Attachment>());
- }
-
- bool messageBodyIsOOL = header->msgh_id & MessageBodyIsOutOfLine;
-
- mach_msg_body_t* body = reinterpret_cast<mach_msg_body_t*>(header + 1);
- mach_msg_size_t numDescriptors = body->msgh_descriptor_count;
- ASSERT(numDescriptors);
-
- uint8_t* descriptorData = reinterpret_cast<uint8_t*>(body + 1);
-
- // If the message body was sent out-of-line, don't treat the last descriptor
- // as an attachment, since it is really the message body.
- if (messageBodyIsOOL)
- --numDescriptors;
-
- // Build attachment list
- Vector<Attachment> attachments(numDescriptors);
-
- for (mach_msg_size_t i = 0; i < numDescriptors; ++i) {
- mach_msg_descriptor_t* descriptor = reinterpret_cast<mach_msg_descriptor_t*>(descriptorData);
-
- switch (descriptor->type.type) {
- case MACH_MSG_PORT_DESCRIPTOR:
- attachments[numDescriptors - i - 1] = Attachment(descriptor->port.name, descriptor->port.disposition);
- descriptorData += sizeof(mach_msg_port_descriptor_t);
- break;
- default:
- ASSERT(false && "Unhandled descriptor type");
- }
- }
-
- if (messageBodyIsOOL) {
- mach_msg_descriptor_t* descriptor = reinterpret_cast<mach_msg_descriptor_t*>(descriptorData);
- ASSERT(descriptor->type.type == MACH_MSG_OOL_DESCRIPTOR);
-
- uint8_t* messageBody = static_cast<uint8_t*>(descriptor->out_of_line.address);
- size_t messageBodySize = descriptor->out_of_line.size;
-
- auto decoder = std::make_unique<MessageDecoder>(DataReference(messageBody, messageBodySize), std::move(attachments));
-
- vm_deallocate(mach_task_self(), reinterpret_cast<vm_address_t>(descriptor->out_of_line.address), descriptor->out_of_line.size);
-
- return decoder;
- }
-
- uint8_t* messageBody = descriptorData;
- size_t messageBodySize = header->msgh_size - (descriptorData - reinterpret_cast<uint8_t*>(header));
-
- return std::make_unique<MessageDecoder>(DataReference(messageBody, messageBodySize), attachments);
-}
-
-// The receive buffer size should always include the maximum trailer size.
-static const size_t receiveBufferSize = inlineMessageMaxSize + MAX_TRAILER_SIZE;
-typedef Vector<char, receiveBufferSize> ReceiveBuffer;
-
-static mach_msg_header_t* readFromMachPort(mach_port_t machPort, ReceiveBuffer& buffer)
-{
- buffer.resize(receiveBufferSize);
-
- mach_msg_header_t* header = reinterpret_cast<mach_msg_header_t*>(buffer.data());
- kern_return_t kr = mach_msg(header, MACH_RCV_MSG | MACH_RCV_LARGE | MACH_RCV_TIMEOUT, 0, buffer.size(), machPort, 0, MACH_PORT_NULL);
- if (kr == MACH_RCV_TIMED_OUT)
- return 0;
-
- if (kr == MACH_RCV_TOO_LARGE) {
- // The message was too large, resize the buffer and try again.
- buffer.resize(header->msgh_size + MAX_TRAILER_SIZE);
- header = reinterpret_cast<mach_msg_header_t*>(buffer.data());
-
- kr = mach_msg(header, MACH_RCV_MSG | MACH_RCV_LARGE | MACH_RCV_TIMEOUT, 0, buffer.size(), machPort, 0, MACH_PORT_NULL);
- ASSERT(kr != MACH_RCV_TOO_LARGE);
- }
-
- if (kr != MACH_MSG_SUCCESS) {
- ASSERT_NOT_REACHED();
- return 0;
- }
-
- return header;
-}
-
-void Connection::receiveSourceEventHandler()
-{
- ReceiveBuffer buffer;
-
- mach_msg_header_t* header = readFromMachPort(m_receivePort, buffer);
- if (!header)
- return;
-
- std::unique_ptr<MessageDecoder> decoder = createMessageDecoder(header);
- ASSERT(decoder);
-
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
- decoder->setImportanceAssertion(std::make_unique<ImportanceAssertion>(header));
-#endif
-
- if (decoder->messageReceiverName() == "IPC" && decoder->messageName() == "InitializeConnection") {
- ASSERT(m_isServer);
- ASSERT(!m_isConnected);
- ASSERT(!m_sendPort);
-
- MachPort port;
- if (!decoder->decode(port)) {
- // FIXME: Disconnect.
- return;
- }
-
- m_sendPort = port.port();
-
- if (m_sendPort) {
- initializeDeadNameSource();
- dispatch_resume(m_deadNameSource);
- }
-
- m_isConnected = true;
-
- // Send any pending outgoing messages.
- sendOutgoingMessages();
-
- return;
- }
-
-#if !PLATFORM(IOS)
- if (decoder->messageReceiverName() == "IPC" && decoder->messageName() == "SetExceptionPort") {
- if (m_isServer) {
- // Server connections aren't supposed to have their exception ports overriden. Treat this as an invalid message.
- m_clientRunLoop.dispatch(bind(&Connection::dispatchDidReceiveInvalidMessage, this, decoder->messageReceiverName().toString(), decoder->messageName().toString()));
- return;
- }
- MachPort exceptionPort;
- if (!decoder->decode(exceptionPort))
- return;
-
- setMachExceptionPort(exceptionPort.port());
- return;
- }
-#endif
-
- processIncomingMessage(std::move(decoder));
-}
-
-#if !PLATFORM(IOS)
-void Connection::exceptionSourceEventHandler()
-{
- ReceiveBuffer buffer;
-
- mach_msg_header_t* header = readFromMachPort(m_exceptionPort, buffer);
- if (!header)
- return;
-
- // We've read the exception message. Now send it on to the real exception port.
-
- // The remote port should have a send once right.
- ASSERT(MACH_MSGH_BITS_REMOTE(header->msgh_bits) == MACH_MSG_TYPE_MOVE_SEND_ONCE);
-
- // Now get the real exception port.
- mach_port_t exceptionPort = machExceptionPort();
-
- // First, get the complex bit from the source message.
- mach_msg_bits_t messageBits = header->msgh_bits & MACH_MSGH_BITS_COMPLEX;
- messageBits |= MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, MACH_MSG_TYPE_MOVE_SEND_ONCE);
-
- header->msgh_bits = messageBits;
- header->msgh_local_port = header->msgh_remote_port;
- header->msgh_remote_port = exceptionPort;
-
- // Now send along the message.
- kern_return_t kr = mach_msg(header, MACH_SEND_MSG, header->msgh_size, 0, MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
- if (kr != KERN_SUCCESS) {
- LOG_ERROR("Failed to send message to real exception port. %s (%x)", mach_error_string(kr), kr);
- ASSERT_NOT_REACHED();
- }
-
- connectionDidClose();
-}
-
-void Connection::setShouldCloseConnectionOnMachExceptions()
-{
- ASSERT(m_exceptionPort == MACH_PORT_NULL);
-
- if (mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &m_exceptionPort) != KERN_SUCCESS)
- ASSERT_NOT_REACHED();
-
- if (mach_port_insert_right(mach_task_self(), m_exceptionPort, m_exceptionPort, MACH_MSG_TYPE_MAKE_SEND) != KERN_SUCCESS)
- ASSERT_NOT_REACHED();
-}
-#endif
-
-IPC::Connection::Identifier Connection::identifier() const
-{
- return Identifier(m_isServer ? m_receivePort : m_sendPort, m_xpcConnection);
-}
-
-bool Connection::getAuditToken(audit_token_t& auditToken)
-{
- if (!m_xpcConnection)
- return false;
-
- xpc_connection_get_audit_token(m_xpcConnection, &auditToken);
- return true;
-}
-
-} // namespace IPC
Copied: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (from rev 168582, trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp) (0 => 168583)
--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (rev 0)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2014-05-10 20:51:20 UTC (rev 168583)
@@ -0,0 +1,533 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "Connection.h"
+
+#include "DataReference.h"
+#include "ImportanceAssertion.h"
+#include "MachPort.h"
+#include "MachUtilities.h"
+#include <mach/mach_error.h>
+#include <mach/vm_map.h>
+#include <wtf/RunLoop.h>
+#include <xpc/xpc.h>
+
+#if __has_include(<xpc/private.h>)
+#include <xpc/private.h>
+#endif
+
+extern "C" void xpc_connection_get_audit_token(xpc_connection_t, audit_token_t*);
+
+namespace IPC {
+
+static const size_t inlineMessageMaxSize = 4096;
+
+// Message flags.
+enum {
+ MessageBodyIsOutOfLine = 1 << 0
+};
+
+void Connection::platformInvalidate()
+{
+ if (!m_isConnected)
+ return;
+
+ m_isConnected = false;
+
+ ASSERT(m_sendPort);
+ ASSERT(m_receivePort);
+
+ // Unregister our ports.
+ dispatch_source_cancel(m_deadNameSource);
+ dispatch_release(m_deadNameSource);
+ m_deadNameSource = 0;
+ m_sendPort = MACH_PORT_NULL;
+
+ dispatch_source_cancel(m_receivePortDataAvailableSource);
+ dispatch_release(m_receivePortDataAvailableSource);
+ m_receivePortDataAvailableSource = 0;
+ m_receivePort = MACH_PORT_NULL;
+
+#if !PLATFORM(IOS)
+ if (m_exceptionPort) {
+ dispatch_source_cancel(m_exceptionPortDataAvailableSource);
+ dispatch_release(m_exceptionPortDataAvailableSource);
+ m_exceptionPortDataAvailableSource = 0;
+ m_exceptionPort = MACH_PORT_NULL;
+ }
+#endif
+
+ if (m_xpcConnection) {
+ xpc_release(m_xpcConnection);
+ m_xpcConnection = 0;
+ }
+}
+
+void Connection::platformInitialize(Identifier identifier)
+{
+#if !PLATFORM(IOS)
+ m_exceptionPort = MACH_PORT_NULL;
+ m_exceptionPortDataAvailableSource = nullptr;
+#endif
+
+ if (m_isServer) {
+ m_receivePort = identifier.port;
+ m_sendPort = MACH_PORT_NULL;
+ } else {
+ m_receivePort = MACH_PORT_NULL;
+ m_sendPort = identifier.port;
+ }
+
+ m_deadNameSource = nullptr;
+ m_receivePortDataAvailableSource = nullptr;
+
+ m_xpcConnection = identifier.xpcConnection;
+ // FIXME: Instead of explicitly retaining the connection here, Identifier::xpcConnection
+ // should just be a smart pointer.
+ if (m_xpcConnection)
+ xpc_retain(m_xpcConnection);
+}
+
+template<typename Function>
+static dispatch_source_t createDataAvailableSource(mach_port_t receivePort, WorkQueue& workQueue, Function&& function)
+{
+ dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV, receivePort, 0, workQueue.dispatchQueue());
+ dispatch_source_set_event_handler(source, function);
+
+ dispatch_source_set_cancel_handler(source, ^{
+ mach_port_mod_refs(mach_task_self(), receivePort, MACH_PORT_RIGHT_RECEIVE, -1);
+ });
+
+ return source;
+}
+
+bool Connection::open()
+{
+ if (m_isServer) {
+ ASSERT(m_receivePort);
+ ASSERT(!m_sendPort);
+
+ } else {
+ ASSERT(!m_receivePort);
+ ASSERT(m_sendPort);
+
+ // Create the receive port.
+ mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &m_receivePort);
+
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+ mach_port_set_attributes(mach_task_self(), m_receivePort, MACH_PORT_IMPORTANCE_RECEIVER, (mach_port_info_t)0, 0);
+#endif
+
+ m_isConnected = true;
+
+ // Send the initialize message, which contains a send right for the server to use.
+ auto encoder = std::make_unique<MessageEncoder>("IPC", "InitializeConnection", 0);
+ encoder->encode(MachPort(m_receivePort, MACH_MSG_TYPE_MAKE_SEND));
+
+ sendMessage(std::move(encoder));
+
+ initializeDeadNameSource();
+ }
+
+ // Change the message queue length for the receive port.
+ setMachPortQueueLength(m_receivePort, MACH_PORT_QLIMIT_LARGE);
+
+ // Register the data available handler.
+ RefPtr<Connection> connection(this);
+ m_receivePortDataAvailableSource = createDataAvailableSource(m_receivePort, *m_connectionQueue, [connection] {
+ connection->receiveSourceEventHandler();
+ });
+
+#if !PLATFORM(IOS)
+ // If we have an exception port, register the data available handler and send over the port to the other end.
+ if (m_exceptionPort) {
+ m_exceptionPortDataAvailableSource = createDataAvailableSource(m_exceptionPort, *m_connectionQueue, [connection] {
+ connection->exceptionSourceEventHandler();
+ });
+
+ auto encoder = std::make_unique<MessageEncoder>("IPC", "SetExceptionPort", 0);
+ encoder->encode(MachPort(m_exceptionPort, MACH_MSG_TYPE_MAKE_SEND));
+
+ sendMessage(std::move(encoder));
+ }
+#endif
+
+ ref();
+ dispatch_async(m_connectionQueue->dispatchQueue(), ^{
+ dispatch_resume(m_receivePortDataAvailableSource);
+
+ if (m_deadNameSource)
+ dispatch_resume(m_deadNameSource);
+#if !PLATFORM(IOS)
+ if (m_exceptionPortDataAvailableSource)
+ dispatch_resume(m_exceptionPortDataAvailableSource);
+#endif
+
+ deref();
+ });
+
+ return true;
+}
+
+static inline size_t machMessageSize(size_t bodySize, size_t numberOfPortDescriptors = 0, size_t numberOfOOLMemoryDescriptors = 0)
+{
+ size_t size = sizeof(mach_msg_header_t) + bodySize;
+ if (numberOfPortDescriptors || numberOfOOLMemoryDescriptors) {
+ size += sizeof(mach_msg_body_t);
+ if (numberOfPortDescriptors)
+ size += (numberOfPortDescriptors * sizeof(mach_msg_port_descriptor_t));
+ if (numberOfOOLMemoryDescriptors)
+ size += (numberOfOOLMemoryDescriptors * sizeof(mach_msg_ool_descriptor_t));
+ }
+ return round_msg(size);
+}
+
+bool Connection::platformCanSendOutgoingMessages() const
+{
+ return true;
+}
+
+bool Connection::sendOutgoingMessage(std::unique_ptr<MessageEncoder> encoder)
+{
+ Vector<Attachment> attachments = encoder->releaseAttachments();
+
+ size_t numberOfPortDescriptors = 0;
+ size_t numberOfOOLMemoryDescriptors = 0;
+ for (size_t i = 0; i < attachments.size(); ++i) {
+ Attachment::Type type = attachments[i].type();
+ if (type == Attachment::MachPortType)
+ numberOfPortDescriptors++;
+ }
+
+ size_t messageSize = machMessageSize(encoder->bufferSize(), numberOfPortDescriptors, numberOfOOLMemoryDescriptors);
+
+ bool messageBodyIsOOL = false;
+ if (messageSize > inlineMessageMaxSize) {
+ messageBodyIsOOL = true;
+
+ numberOfOOLMemoryDescriptors++;
+ messageSize = machMessageSize(0, numberOfPortDescriptors, numberOfOOLMemoryDescriptors);
+ }
+
+ char stackBuffer[inlineMessageMaxSize];
+ char* buffer = &stackBuffer[0];
+ if (messageSize > inlineMessageMaxSize)
+ buffer = (char*)mmap(0, messageSize, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
+
+ bool isComplex = (numberOfPortDescriptors + numberOfOOLMemoryDescriptors > 0);
+
+ mach_msg_header_t* header = reinterpret_cast<mach_msg_header_t*>(buffer);
+ header->msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, 0);
+ header->msgh_size = messageSize;
+ header->msgh_remote_port = m_sendPort;
+ header->msgh_local_port = MACH_PORT_NULL;
+ header->msgh_id = 0;
+ if (messageBodyIsOOL)
+ header->msgh_id |= MessageBodyIsOutOfLine;
+
+ uint8_t* messageData;
+
+ if (isComplex) {
+ header->msgh_bits |= MACH_MSGH_BITS_COMPLEX;
+
+ mach_msg_body_t* body = reinterpret_cast<mach_msg_body_t*>(header + 1);
+ body->msgh_descriptor_count = numberOfPortDescriptors + numberOfOOLMemoryDescriptors;
+ uint8_t* descriptorData = reinterpret_cast<uint8_t*>(body + 1);
+
+ for (size_t i = 0; i < attachments.size(); ++i) {
+ Attachment attachment = attachments[i];
+
+ mach_msg_descriptor_t* descriptor = reinterpret_cast<mach_msg_descriptor_t*>(descriptorData);
+ switch (attachment.type()) {
+ case Attachment::MachPortType:
+ descriptor->port.name = attachment.port();
+ descriptor->port.disposition = attachment.disposition();
+ descriptor->port.type = MACH_MSG_PORT_DESCRIPTOR;
+
+ descriptorData += sizeof(mach_msg_port_descriptor_t);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+ }
+
+ if (messageBodyIsOOL) {
+ mach_msg_descriptor_t* descriptor = reinterpret_cast<mach_msg_descriptor_t*>(descriptorData);
+
+ descriptor->out_of_line.address = encoder->buffer();
+ descriptor->out_of_line.size = encoder->bufferSize();
+ descriptor->out_of_line.copy = MACH_MSG_VIRTUAL_COPY;
+ descriptor->out_of_line.deallocate = false;
+ descriptor->out_of_line.type = MACH_MSG_OOL_DESCRIPTOR;
+
+ descriptorData += sizeof(mach_msg_ool_descriptor_t);
+ }
+
+ messageData = descriptorData;
+ } else
+ messageData = (uint8_t*)(header + 1);
+
+ // Copy the data if it is not being sent out-of-line.
+ if (!messageBodyIsOOL)
+ memcpy(messageData, encoder->buffer(), encoder->bufferSize());
+
+ ASSERT(m_sendPort);
+
+ // Send the message.
+ kern_return_t kr = mach_msg(header, MACH_SEND_MSG, messageSize, 0, MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
+ if (kr != KERN_SUCCESS) {
+ // FIXME: What should we do here?
+ }
+
+ if (buffer != &stackBuffer[0])
+ munmap(buffer, messageSize);
+
+ return true;
+}
+
+void Connection::initializeDeadNameSource()
+{
+ m_deadNameSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_SEND, m_sendPort, 0, m_connectionQueue->dispatchQueue());
+ dispatch_source_set_event_handler(m_deadNameSource, bind(&Connection::connectionDidClose, this));
+
+ mach_port_t sendPort = m_sendPort;
+ dispatch_source_set_cancel_handler(m_deadNameSource, ^{
+ // Release our send right.
+ mach_port_deallocate(mach_task_self(), sendPort);
+ });
+}
+
+static std::unique_ptr<MessageDecoder> createMessageDecoder(mach_msg_header_t* header)
+{
+ if (!(header->msgh_bits & MACH_MSGH_BITS_COMPLEX)) {
+ // We have a simple message.
+ uint8_t* body = reinterpret_cast<uint8_t*>(header + 1);
+ size_t bodySize = header->msgh_size - sizeof(mach_msg_header_t);
+
+ return std::make_unique<MessageDecoder>(DataReference(body, bodySize), Vector<Attachment>());
+ }
+
+ bool messageBodyIsOOL = header->msgh_id & MessageBodyIsOutOfLine;
+
+ mach_msg_body_t* body = reinterpret_cast<mach_msg_body_t*>(header + 1);
+ mach_msg_size_t numDescriptors = body->msgh_descriptor_count;
+ ASSERT(numDescriptors);
+
+ uint8_t* descriptorData = reinterpret_cast<uint8_t*>(body + 1);
+
+ // If the message body was sent out-of-line, don't treat the last descriptor
+ // as an attachment, since it is really the message body.
+ if (messageBodyIsOOL)
+ --numDescriptors;
+
+ // Build attachment list
+ Vector<Attachment> attachments(numDescriptors);
+
+ for (mach_msg_size_t i = 0; i < numDescriptors; ++i) {
+ mach_msg_descriptor_t* descriptor = reinterpret_cast<mach_msg_descriptor_t*>(descriptorData);
+
+ switch (descriptor->type.type) {
+ case MACH_MSG_PORT_DESCRIPTOR:
+ attachments[numDescriptors - i - 1] = Attachment(descriptor->port.name, descriptor->port.disposition);
+ descriptorData += sizeof(mach_msg_port_descriptor_t);
+ break;
+ default:
+ ASSERT(false && "Unhandled descriptor type");
+ }
+ }
+
+ if (messageBodyIsOOL) {
+ mach_msg_descriptor_t* descriptor = reinterpret_cast<mach_msg_descriptor_t*>(descriptorData);
+ ASSERT(descriptor->type.type == MACH_MSG_OOL_DESCRIPTOR);
+
+ uint8_t* messageBody = static_cast<uint8_t*>(descriptor->out_of_line.address);
+ size_t messageBodySize = descriptor->out_of_line.size;
+
+ auto decoder = std::make_unique<MessageDecoder>(DataReference(messageBody, messageBodySize), std::move(attachments));
+
+ vm_deallocate(mach_task_self(), reinterpret_cast<vm_address_t>(descriptor->out_of_line.address), descriptor->out_of_line.size);
+
+ return decoder;
+ }
+
+ uint8_t* messageBody = descriptorData;
+ size_t messageBodySize = header->msgh_size - (descriptorData - reinterpret_cast<uint8_t*>(header));
+
+ return std::make_unique<MessageDecoder>(DataReference(messageBody, messageBodySize), attachments);
+}
+
+// The receive buffer size should always include the maximum trailer size.
+static const size_t receiveBufferSize = inlineMessageMaxSize + MAX_TRAILER_SIZE;
+typedef Vector<char, receiveBufferSize> ReceiveBuffer;
+
+static mach_msg_header_t* readFromMachPort(mach_port_t machPort, ReceiveBuffer& buffer)
+{
+ buffer.resize(receiveBufferSize);
+
+ mach_msg_header_t* header = reinterpret_cast<mach_msg_header_t*>(buffer.data());
+ kern_return_t kr = mach_msg(header, MACH_RCV_MSG | MACH_RCV_LARGE | MACH_RCV_TIMEOUT, 0, buffer.size(), machPort, 0, MACH_PORT_NULL);
+ if (kr == MACH_RCV_TIMED_OUT)
+ return 0;
+
+ if (kr == MACH_RCV_TOO_LARGE) {
+ // The message was too large, resize the buffer and try again.
+ buffer.resize(header->msgh_size + MAX_TRAILER_SIZE);
+ header = reinterpret_cast<mach_msg_header_t*>(buffer.data());
+
+ kr = mach_msg(header, MACH_RCV_MSG | MACH_RCV_LARGE | MACH_RCV_TIMEOUT, 0, buffer.size(), machPort, 0, MACH_PORT_NULL);
+ ASSERT(kr != MACH_RCV_TOO_LARGE);
+ }
+
+ if (kr != MACH_MSG_SUCCESS) {
+ ASSERT_NOT_REACHED();
+ return 0;
+ }
+
+ return header;
+}
+
+void Connection::receiveSourceEventHandler()
+{
+ ReceiveBuffer buffer;
+
+ mach_msg_header_t* header = readFromMachPort(m_receivePort, buffer);
+ if (!header)
+ return;
+
+ std::unique_ptr<MessageDecoder> decoder = createMessageDecoder(header);
+ ASSERT(decoder);
+
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+ decoder->setImportanceAssertion(std::make_unique<ImportanceAssertion>(header));
+#endif
+
+ if (decoder->messageReceiverName() == "IPC" && decoder->messageName() == "InitializeConnection") {
+ ASSERT(m_isServer);
+ ASSERT(!m_isConnected);
+ ASSERT(!m_sendPort);
+
+ MachPort port;
+ if (!decoder->decode(port)) {
+ // FIXME: Disconnect.
+ return;
+ }
+
+ m_sendPort = port.port();
+
+ if (m_sendPort) {
+ initializeDeadNameSource();
+ dispatch_resume(m_deadNameSource);
+ }
+
+ m_isConnected = true;
+
+ // Send any pending outgoing messages.
+ sendOutgoingMessages();
+
+ return;
+ }
+
+#if !PLATFORM(IOS)
+ if (decoder->messageReceiverName() == "IPC" && decoder->messageName() == "SetExceptionPort") {
+ if (m_isServer) {
+ // Server connections aren't supposed to have their exception ports overriden. Treat this as an invalid message.
+ m_clientRunLoop.dispatch(bind(&Connection::dispatchDidReceiveInvalidMessage, this, decoder->messageReceiverName().toString(), decoder->messageName().toString()));
+ return;
+ }
+ MachPort exceptionPort;
+ if (!decoder->decode(exceptionPort))
+ return;
+
+ setMachExceptionPort(exceptionPort.port());
+ return;
+ }
+#endif
+
+ processIncomingMessage(std::move(decoder));
+}
+
+#if !PLATFORM(IOS)
+void Connection::exceptionSourceEventHandler()
+{
+ ReceiveBuffer buffer;
+
+ mach_msg_header_t* header = readFromMachPort(m_exceptionPort, buffer);
+ if (!header)
+ return;
+
+ // We've read the exception message. Now send it on to the real exception port.
+
+ // The remote port should have a send once right.
+ ASSERT(MACH_MSGH_BITS_REMOTE(header->msgh_bits) == MACH_MSG_TYPE_MOVE_SEND_ONCE);
+
+ // Now get the real exception port.
+ mach_port_t exceptionPort = machExceptionPort();
+
+ // First, get the complex bit from the source message.
+ mach_msg_bits_t messageBits = header->msgh_bits & MACH_MSGH_BITS_COMPLEX;
+ messageBits |= MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, MACH_MSG_TYPE_MOVE_SEND_ONCE);
+
+ header->msgh_bits = messageBits;
+ header->msgh_local_port = header->msgh_remote_port;
+ header->msgh_remote_port = exceptionPort;
+
+ // Now send along the message.
+ kern_return_t kr = mach_msg(header, MACH_SEND_MSG, header->msgh_size, 0, MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
+ if (kr != KERN_SUCCESS) {
+ LOG_ERROR("Failed to send message to real exception port. %s (%x)", mach_error_string(kr), kr);
+ ASSERT_NOT_REACHED();
+ }
+
+ connectionDidClose();
+}
+
+void Connection::setShouldCloseConnectionOnMachExceptions()
+{
+ ASSERT(m_exceptionPort == MACH_PORT_NULL);
+
+ if (mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &m_exceptionPort) != KERN_SUCCESS)
+ ASSERT_NOT_REACHED();
+
+ if (mach_port_insert_right(mach_task_self(), m_exceptionPort, m_exceptionPort, MACH_MSG_TYPE_MAKE_SEND) != KERN_SUCCESS)
+ ASSERT_NOT_REACHED();
+}
+#endif
+
+IPC::Connection::Identifier Connection::identifier() const
+{
+ return Identifier(m_isServer ? m_receivePort : m_sendPort, m_xpcConnection);
+}
+
+bool Connection::getAuditToken(audit_token_t& auditToken)
+{
+ if (!m_xpcConnection)
+ return false;
+
+ xpc_connection_get_audit_token(m_xpcConnection, &auditToken);
+ return true;
+}
+
+} // namespace IPC
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (168582 => 168583)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-05-10 20:20:36 UTC (rev 168582)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-05-10 20:51:20 UTC (rev 168583)
@@ -180,7 +180,7 @@
1A2D956F12848564001EB962 /* ChildProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2D956D12848564001EB962 /* ChildProcess.h */; };
1A2D957012848564001EB962 /* ChildProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D956E12848564001EB962 /* ChildProcess.cpp */; };
1A30066E1110F4F70031937C /* ResponsivenessTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */; };
- 1A30EAC6115D7DA30053E937 /* ConnectionMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A30EAC5115D7DA30053E937 /* ConnectionMac.cpp */; };
+ 1A30EAC6115D7DA30053E937 /* ConnectionMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A30EAC5115D7DA30053E937 /* ConnectionMac.mm */; };
1A334DED16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */; };
1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */; };
1A3C888018A5ABAE00C4C962 /* WKPreferencesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */; };
@@ -1990,7 +1990,7 @@
1A2D956D12848564001EB962 /* ChildProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildProcess.h; sourceTree = "<group>"; };
1A2D956E12848564001EB962 /* ChildProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChildProcess.cpp; sourceTree = "<group>"; };
1A30066C1110F4F70031937C /* ResponsivenessTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResponsivenessTimer.h; sourceTree = "<group>"; };
- 1A30EAC5115D7DA30053E937 /* ConnectionMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConnectionMac.cpp; sourceTree = "<group>"; };
+ 1A30EAC5115D7DA30053E937 /* ConnectionMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ConnectionMac.mm; sourceTree = "<group>"; };
1A334DEA16DE8B68006A8E38 /* StorageAreaMap.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageAreaMap.messages.in; sourceTree = "<group>"; };
1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaMapMessageReceiver.cpp; sourceTree = "<group>"; };
1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaMapMessages.h; sourceTree = "<group>"; };
@@ -6269,7 +6269,7 @@
BCC56F751159955E001CCAF9 /* mac */ = {
isa = PBXGroup;
children = (
- 1A30EAC5115D7DA30053E937 /* ConnectionMac.cpp */,
+ 1A30EAC5115D7DA30053E937 /* ConnectionMac.mm */,
1A1EC69D1872092100B951F0 /* ImportanceAssertion.h */,
BCC56F771159957D001CCAF9 /* MachPort.h */,
);
@@ -8398,7 +8398,7 @@
1A6F9FB711E1408500DB1371 /* CommandLinePOSIX.cpp in Sources */,
BC032DAA10F437D10058C15A /* Connection.cpp in Sources */,
2DA944A31884E4F000ED86DB /* WebTouchEventIOS.cpp in Sources */,
- 1A30EAC6115D7DA30053E937 /* ConnectionMac.cpp in Sources */,
+ 1A30EAC6115D7DA30053E937 /* ConnectionMac.mm in Sources */,
5136183D163126DA00A99DDE /* ConnectionStack.cpp in Sources */,
2DA944B91884EA3900ED86DB /* WebBackForwardListProxyIOS.mm in Sources */,
515E773318402D510007203F /* UniqueIDBDatabaseIdentifier.cpp in Sources */,
