<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[211644] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/211644">211644</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2017-02-03 12:28:40 -0800 (Fri, 03 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Inline createReceiveSource in its two call sites
https://bugs.webkit.org/show_bug.cgi?id=167809
Reviewed by Alex Christensen.
* Platform/IPC/mac/ConnectionMac.mm:
(IPC::Connection::open):
(IPC::createReceiveSource): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCmacConnectionMacmm">trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211643 => 211644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-03 20:07:49 UTC (rev 211643)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-03 20:28:40 UTC (rev 211644)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-02-03 Anders Carlsson <andersca@apple.com>
+
+ Inline createReceiveSource in its two call sites
+ https://bugs.webkit.org/show_bug.cgi?id=167809
+
+ Reviewed by Alex Christensen.
+
+ * Platform/IPC/mac/ConnectionMac.mm:
+ (IPC::Connection::open):
+ (IPC::createReceiveSource): Deleted.
+
</ins><span class="cx"> 2017-02-03 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> WKActionSheet should dismiss with animation when done with the sheet
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacConnectionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (211643 => 211644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2017-02-03 20:07:49 UTC (rev 211643)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2017-02-03 20:28:40 UTC (rev 211644)
</span><span class="lines">@@ -181,19 +181,6 @@
</span><span class="cx"> m_xpcConnection = identifier.xpcConnection;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename Function>
-static dispatch_source_t createReceiveSource(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;
-}
-
</del><span class="cx"> bool Connection::open()
</span><span class="cx"> {
</span><span class="cx"> if (m_isServer) {
</span><span class="lines">@@ -225,17 +212,24 @@
</span><span class="cx"> // Change the message queue length for the receive port.
</span><span class="cx"> setMachPortQueueLength(m_receivePort, MACH_PORT_QLIMIT_LARGE);
</span><span class="cx">
</span><del>- // Register the data available handler.
</del><span class="cx"> RefPtr<Connection> connection(this);
</span><del>- m_receiveSource = createReceiveSource(m_receivePort, m_connectionQueue, [connection] {
</del><ins>+ m_receiveSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV, m_receivePort, 0, m_connectionQueue->dispatchQueue());
+ dispatch_source_set_event_handler(m_receiveSource, [connection] {
</ins><span class="cx"> connection->receiveSourceEventHandler();
</span><span class="cx"> });
</span><ins>+ dispatch_source_set_cancel_handler(m_receiveSource, [connection] {
+ mach_port_mod_refs(mach_task_self(), connection->m_receivePort, MACH_PORT_RIGHT_RECEIVE, -1);
+ });
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</span><span class="cx"> if (m_exceptionPort) {
</span><del>- m_exceptionPortDataAvailableSource = createReceiveSource(m_exceptionPort, m_connectionQueue, [connection] {
</del><ins>+ m_exceptionPortDataAvailableSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV, m_exceptionPort, 0, m_connectionQueue->dispatchQueue());
+ dispatch_source_set_event_handler(m_exceptionPortDataAvailableSource, [connection] {
</ins><span class="cx"> connection->exceptionSourceEventHandler();
</span><span class="cx"> });
</span><ins>+ dispatch_source_set_cancel_handler(m_exceptionPortDataAvailableSource, [connection] {
+ mach_port_mod_refs(mach_task_self(), connection->m_exceptionPort, MACH_PORT_RIGHT_RECEIVE, -1);
+ });
</ins><span class="cx">
</span><span class="cx"> auto encoder = std::make_unique<Encoder>("IPC", "SetExceptionPort", 0);
</span><span class="cx"> encoder->encode(MachPort(m_exceptionPort, MACH_MSG_TYPE_MAKE_SEND));
</span></span></pre>
</div>
</div>
</body>
</html>