<!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>[237460] trunk/Source/WebKit</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/237460">237460</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2018-10-26 08:34:18 -0700 (Fri, 26 Oct 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Modernize / Simplify IPC::Connection::sendOutgoingMessage()
https://bugs.webkit.org/show_bug.cgi?id=190931

Reviewed by Alex Christensen.

* Platform/IPC/mac/ConnectionMac.mm:
(IPC::Connection::sendOutgoingMessage):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformIPCmacConnectionMacmm">trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (237459 => 237460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2018-10-26 15:29:11 UTC (rev 237459)
+++ trunk/Source/WebKit/ChangeLog       2018-10-26 15:34:18 UTC (rev 237460)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2018-10-26  Chris Dumez  <cdumez@apple.com>
+
+        Modernize / Simplify IPC::Connection::sendOutgoingMessage()
+        https://bugs.webkit.org/show_bug.cgi?id=190931
+
+        Reviewed by Alex Christensen.
+
+        * Platform/IPC/mac/ConnectionMac.mm:
+        (IPC::Connection::sendOutgoingMessage):
+
</ins><span class="cx"> 2018-10-26  Jer Noble  <jer.noble@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Adopt -setOverrideRouteSharingPolicy:routingContextUID: SPI
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformIPCmacConnectionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm (237459 => 237460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm    2018-10-26 15:29:11 UTC (rev 237459)
+++ trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm       2018-10-26 15:34:18 UTC (rev 237460)
</span><span class="lines">@@ -297,84 +297,63 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!m_pendingOutgoingMachMessage && !m_isInitializingSendSource);
</span><span class="cx"> 
</span><del>-    Vector<Attachment> attachments = encoder->releaseAttachments();
</del><ins>+    auto attachments = encoder->releaseAttachments();
</ins><span class="cx">     
</span><del>-    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 = MachMessage::messageSize(encoder->bufferSize(), numberOfPortDescriptors, numberOfOOLMemoryDescriptors);
-
</del><ins>+    auto numberOfPortDescriptors = std::count_if(attachments.begin(), attachments.end(), [](auto& attachment) { return attachment.type() == Attachment::MachPortType; });
</ins><span class="cx">     bool messageBodyIsOOL = false;
</span><ins>+    auto messageSize = MachMessage::messageSize(encoder->bufferSize(), numberOfPortDescriptors, messageBodyIsOOL);
</ins><span class="cx">     if (messageSize > inlineMessageMaxSize) {
</span><span class="cx">         messageBodyIsOOL = true;
</span><del>-
-        numberOfOOLMemoryDescriptors++;
-        messageSize = MachMessage::messageSize(0, numberOfPortDescriptors, numberOfOOLMemoryDescriptors);
</del><ins>+        messageSize = MachMessage::messageSize(0, numberOfPortDescriptors, messageBodyIsOOL);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     auto message = MachMessage::create(messageSize);
</span><del>-
</del><span class="cx">     message->setMessageReceiverName(encoder->messageReceiverName().toString());
</span><span class="cx">     message->setMessageName(encoder->messageName().toString());
</span><span class="cx"> 
</span><del>-    bool isComplex = (numberOfPortDescriptors + numberOfOOLMemoryDescriptors) > 0;
-
-    mach_msg_header_t* header = message->header();
</del><ins>+    auto* header = message->header();
</ins><span class="cx">     header->msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, 0);
</span><span class="cx">     header->msgh_size = messageSize;
</span><span class="cx">     header->msgh_remote_port = m_sendPort;
</span><span class="cx">     header->msgh_local_port = MACH_PORT_NULL;
</span><span class="cx">     header->msgh_id = 0;
</span><del>-    if (messageBodyIsOOL)
-        header->msgh_id |= MessageBodyIsOutOfLine;
</del><span class="cx"> 
</span><del>-    uint8_t* messageData;
</del><ins>+    auto* messageData = reinterpret_cast<uint8_t*>(header + 1);
</ins><span class="cx"> 
</span><ins>+    bool isComplex = numberOfPortDescriptors || messageBodyIsOOL;
</ins><span class="cx">     if (isComplex) {
</span><span class="cx">         header->msgh_bits |= MACH_MSGH_BITS_COMPLEX;
</span><span class="cx"> 
</span><del>-        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);
</del><ins>+        auto* body = reinterpret_cast<mach_msg_body_t*>(messageData);
+        body->msgh_descriptor_count = numberOfPortDescriptors + messageBodyIsOOL;
+        messageData = reinterpret_cast<uint8_t*>(body + 1);
</ins><span class="cx"> 
</span><del>-        for (size_t i = 0; i < attachments.size(); ++i) {
-            Attachment attachment = attachments[i];
</del><ins>+        auto getDescriptorAndSkip = [](uint8_t*& data) {
+            return reinterpret_cast<mach_msg_descriptor_t*>(std::exchange(data, data + sizeof(mach_msg_port_descriptor_t)));
+        };
</ins><span class="cx"> 
</span><del>-            mach_msg_descriptor_t* descriptor = reinterpret_cast<mach_msg_descriptor_t*>(descriptorData);
-            switch (attachment.type()) {
-            case Attachment::MachPortType:
</del><ins>+        for (auto& attachment : attachments) {
+            ASSERT(attachment.type() == Attachment::MachPortType);
+            if (attachment.type() == Attachment::MachPortType) {
+                auto* descriptor = getDescriptorAndSkip(messageData);
</ins><span class="cx">                 descriptor->port.name = attachment.port();
</span><span class="cx">                 descriptor->port.disposition = attachment.disposition();
</span><del>-                descriptor->port.type = MACH_MSG_PORT_DESCRIPTOR;            
-
-                descriptorData += sizeof(mach_msg_port_descriptor_t);
-                break;
-            default:
-                ASSERT_NOT_REACHED();
</del><ins>+                descriptor->port.type = MACH_MSG_PORT_DESCRIPTOR;
</ins><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if (messageBodyIsOOL) {
</span><del>-            mach_msg_descriptor_t* descriptor = reinterpret_cast<mach_msg_descriptor_t*>(descriptorData);
</del><ins>+            header->msgh_id |= MessageBodyIsOutOfLine;
</ins><span class="cx"> 
</span><ins>+            auto* descriptor = getDescriptorAndSkip(messageData);
</ins><span class="cx">             descriptor->out_of_line.address = encoder->buffer();
</span><span class="cx">             descriptor->out_of_line.size = encoder->bufferSize();
</span><span class="cx">             descriptor->out_of_line.copy = MACH_MSG_VIRTUAL_COPY;
</span><span class="cx">             descriptor->out_of_line.deallocate = false;
</span><span class="cx">             descriptor->out_of_line.type = MACH_MSG_OOL_DESCRIPTOR;
</span><del>-
-            descriptorData += sizeof(mach_msg_ool_descriptor_t);
</del><span class="cx">         }
</span><ins>+    }
</ins><span class="cx"> 
</span><del>-        messageData = descriptorData;
-    } else
-        messageData = (uint8_t*)(header + 1);
-
</del><span class="cx">     // Copy the data if it is not being sent out-of-line.
</span><span class="cx">     if (!messageBodyIsOOL)
</span><span class="cx">         memcpy(messageData, encoder->buffer(), encoder->bufferSize());
</span></span></pre>
</div>
</div>

</body>
</html>