diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-27 02:11:30 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-28 15:30:37 +0000 |
| commit | 54e605a32bdceab163e4f2725794c1aab43adc73 (patch) | |
| tree | 493e0254601213505e06fcf12900646da050025a /Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm | |
| parent | 4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4 (diff) | |
| download | qtwebkit-54e605a32bdceab163e4f2725794c1aab43adc73.tar.gz | |
Import WebKit commit 7aa9943a36e7f3e72207dbf448d2d80fb368a300
Change-Id: I7e96b8e5ba5eef9b0c6c0835e200f770200573ed
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm')
| -rw-r--r-- | Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm b/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm index 8626bf29c..b7ac61a9d 100644 --- a/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm +++ b/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm @@ -130,7 +130,7 @@ void Connection::platformInvalidate() m_receivePortDataAvailableSource = 0; m_receivePort = MACH_PORT_NULL; -#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000 +#if (PLATFORM(MAC) || (PLATFORM(QT) && USE(MACH_PORTS))) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000 if (m_exceptionPort) { dispatch_source_cancel(m_exceptionPortDataAvailableSource); dispatch_release(m_exceptionPortDataAvailableSource); @@ -150,7 +150,7 @@ void Connection::terminateSoon(double intervalInSeconds) void Connection::platformInitialize(Identifier identifier) { -#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000 +#if (PLATFORM(MAC) || (PLATFORM(QT) && USE(MACH_PORTS))) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000 m_exceptionPort = MACH_PORT_NULL; m_exceptionPortDataAvailableSource = nullptr; #endif @@ -219,7 +219,7 @@ bool Connection::open() connection->receiveSourceEventHandler(); }); -#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000 +#if (PLATFORM(MAC) || (PLATFORM(QT) && USE(MACH_PORTS))) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000 if (m_exceptionPort) { m_exceptionPortDataAvailableSource = createDataAvailableSource(m_exceptionPort, m_connectionQueue, [connection] { connection->exceptionSourceEventHandler(); @@ -238,7 +238,7 @@ bool Connection::open() if (m_deadNameSource) dispatch_resume(m_deadNameSource); -#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000 +#if (PLATFORM(MAC) || (PLATFORM(QT) && USE(MACH_PORTS))) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000 if (m_exceptionPortDataAvailableSource) dispatch_resume(m_exceptionPortDataAvailableSource); #endif @@ -540,7 +540,7 @@ void Connection::receiveSourceEventHandler() processIncomingMessage(WTFMove(decoder)); } -#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000 +#if (PLATFORM(MAC) || (PLATFORM(QT) && USE(MACH_PORTS))) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000 void Connection::exceptionSourceEventHandler() { ReceiveBuffer buffer; |