Title: [182086] trunk/Source/WebKit2
- Revision
- 182086
- Author
- [email protected]
- Date
- 2015-03-27 15:07:47 -0700 (Fri, 27 Mar 2015)
Log Message
Only do the Connection::setShouldCloseConnectionOnMachExceptions() hack where necessary
https://bugs.webkit.org/show_bug.cgi?id=143141
rdar://problem/19471284
Reviewed by Andreas Kling.
* Platform/IPC/Connection.h:
* Platform/IPC/mac/ConnectionMac.mm:
(IPC::Connection::platformInvalidate):
(IPC::Connection::platformInitialize):
(IPC::Connection::open):
* Shared/ChildProcessProxy.cpp:
(WebKit::ChildProcessProxy::didFinishLaunching):
* UIProcess/Plugins/PluginProcessProxy.cpp:
(WebKit::PluginProcessProxy::didFinishLaunching):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (182085 => 182086)
--- trunk/Source/WebKit2/ChangeLog 2015-03-27 22:04:55 UTC (rev 182085)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-27 22:07:47 UTC (rev 182086)
@@ -1,3 +1,21 @@
+2015-03-27 Anders Carlsson <[email protected]>
+
+ Only do the Connection::setShouldCloseConnectionOnMachExceptions() hack where necessary
+ https://bugs.webkit.org/show_bug.cgi?id=143141
+ rdar://problem/19471284
+
+ Reviewed by Andreas Kling.
+
+ * Platform/IPC/Connection.h:
+ * Platform/IPC/mac/ConnectionMac.mm:
+ (IPC::Connection::platformInvalidate):
+ (IPC::Connection::platformInitialize):
+ (IPC::Connection::open):
+ * Shared/ChildProcessProxy.cpp:
+ (WebKit::ChildProcessProxy::didFinishLaunching):
+ * UIProcess/Plugins/PluginProcessProxy.cpp:
+ (WebKit::PluginProcessProxy::didFinishLaunching):
+
2015-03-27 Tim Horton <[email protected]>
Implement iOS WebKit2 PDF Find-in-Page
Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (182085 => 182086)
--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2015-03-27 22:04:55 UTC (rev 182085)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2015-03-27 22:07:47 UTC (rev 182086)
@@ -150,7 +150,7 @@
Client* client() const { return m_client; }
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
void setShouldCloseConnectionOnMachExceptions();
#endif
@@ -324,7 +324,7 @@
mach_port_t m_receivePort;
dispatch_source_t m_receivePortDataAvailableSource;
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
void exceptionSourceEventHandler();
// If setShouldCloseConnectionOnMachExceptions has been called, this has
Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (182085 => 182086)
--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2015-03-27 22:04:55 UTC (rev 182085)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2015-03-27 22:07:47 UTC (rev 182086)
@@ -119,7 +119,7 @@
m_receivePortDataAvailableSource = 0;
m_receivePort = MACH_PORT_NULL;
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
if (m_exceptionPort) {
dispatch_source_cancel(m_exceptionPortDataAvailableSource);
dispatch_release(m_exceptionPortDataAvailableSource);
@@ -139,7 +139,7 @@
void Connection::platformInitialize(Identifier identifier)
{
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
m_exceptionPort = MACH_PORT_NULL;
m_exceptionPortDataAvailableSource = nullptr;
#endif
@@ -210,8 +210,7 @@
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 PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
if (m_exceptionPort) {
m_exceptionPortDataAvailableSource = createDataAvailableSource(m_exceptionPort, m_connectionQueue, [connection] {
connection->exceptionSourceEventHandler();
@@ -230,7 +229,7 @@
if (m_deadNameSource)
dispatch_resume(m_deadNameSource);
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
if (m_exceptionPortDataAvailableSource)
dispatch_resume(m_exceptionPortDataAvailableSource);
#endif
@@ -532,7 +531,7 @@
processIncomingMessage(WTF::move(decoder));
}
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
void Connection::exceptionSourceEventHandler()
{
ReceiveBuffer buffer;
Modified: trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp (182085 => 182086)
--- trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp 2015-03-27 22:04:55 UTC (rev 182085)
+++ trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp 2015-03-27 22:07:47 UTC (rev 182086)
@@ -134,7 +134,7 @@
ASSERT(!m_connection);
m_connection = IPC::Connection::createServerConnection(connectionIdentifier, *this, RunLoop::main());
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
m_connection->setShouldCloseConnectionOnMachExceptions();
#endif
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp (182085 => 182086)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2015-03-27 22:04:55 UTC (rev 182085)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2015-03-27 22:07:47 UTC (rev 182086)
@@ -188,7 +188,7 @@
}
m_connection = IPC::Connection::createServerConnection(connectionIdentifier, *this, RunLoop::main());
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
m_connection->setShouldCloseConnectionOnMachExceptions();
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
