<!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>[183176] 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/183176">183176</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-23 00:28:48 -0700 (Thu, 23 Apr 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[UNIX] Simplify the file descriptor handling in SharedMemory
https://bugs.webkit.org/show_bug.cgi?id=144046

Reviewed by Darin Adler.

Simplify the file descriptor handling and clarify its ownership by
using IPC::Attachment in SharedMemory::Handle instead of fd and
size members. SharedMemory::Handle::adoptFromAttachment() has been
renamed as SharedMemory::Handle::adoptAttachment() and receives an
IPC::Attachment. And SharedMemory::Handle::releaseToAttachment()
has been renamed as SharedMemory::Handle::releaseAttachment().

* Platform/IPC/Attachment.h: Add move constructor and move assigned operator.
* Platform/IPC/Connection.h:
(IPC::Connection::identifierIsNull): A file descriptor is null
when it's -1 no 0.
* Platform/IPC/unix/AttachmentUnix.cpp:
(IPC::Attachment::Attachment):
(IPC::Attachment::operator=):
(IPC::Attachment::dispose): Reset the file descriptor after
closing it.
* Platform/IPC/unix/ConnectionUnix.cpp:
(IPC::Connection::processMessage): Use
SharedMemory::Handle::adoptAttachment() that receives an
IPC::Attachment now.
(IPC::Connection::sendOutgoingMessage): Use
SharedMemory::Handle::releaseAttachment().
* Platform/SharedMemory.h:
* Platform/unix/SharedMemoryUnix.cpp:
(WebKit::SharedMemory::Handle::Handle): Remove initializers for
file descriptor and size members.
(WebKit::SharedMemory::Handle::clear): Dispose the attachment.
(WebKit::SharedMemory::Handle::isNull): Handle is null if the
attachment file descriptor is -1.
(WebKit::SharedMemory::Handle::encode): Use releaseAttachment().
(WebKit::SharedMemory::Handle::decode): Use adoptAttachment().
(WebKit::SharedMemory::Handle::releaseAttachment): Implement it
using move.
(WebKit::SharedMemory::Handle::adoptAttachment): Ditto.
(WebKit::SharedMemory::map): Use
IPC::Attachment::releaseFileDescriptor() instead of manually
changing the member.
(WebKit::SharedMemory::createHandle): Initialize the handle
attachment with the duplicated file descriptor and size.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCAttachmenth">trunk/Source/WebKit2/Platform/IPC/Attachment.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectionh">trunk/Source/WebKit2/Platform/IPC/Connection.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCunixAttachmentUnixcpp">trunk/Source/WebKit2/Platform/IPC/unix/AttachmentUnix.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCunixConnectionUnixcpp">trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformSharedMemoryh">trunk/Source/WebKit2/Platform/SharedMemory.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformunixSharedMemoryUnixcpp">trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183175 => 183176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-04-23 07:24:57 UTC (rev 183175)
+++ trunk/Source/WebKit2/ChangeLog        2015-04-23 07:28:48 UTC (rev 183176)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2015-04-23  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
+
+        [UNIX] Simplify the file descriptor handling in SharedMemory
+        https://bugs.webkit.org/show_bug.cgi?id=144046
+
+        Reviewed by Darin Adler.
+
+        Simplify the file descriptor handling and clarify its ownership by
+        using IPC::Attachment in SharedMemory::Handle instead of fd and
+        size members. SharedMemory::Handle::adoptFromAttachment() has been
+        renamed as SharedMemory::Handle::adoptAttachment() and receives an
+        IPC::Attachment. And SharedMemory::Handle::releaseToAttachment()
+        has been renamed as SharedMemory::Handle::releaseAttachment().
+
+        * Platform/IPC/Attachment.h: Add move constructor and move assigned operator.
+        * Platform/IPC/Connection.h:
+        (IPC::Connection::identifierIsNull): A file descriptor is null
+        when it's -1 no 0.
+        * Platform/IPC/unix/AttachmentUnix.cpp:
+        (IPC::Attachment::Attachment):
+        (IPC::Attachment::operator=):
+        (IPC::Attachment::dispose): Reset the file descriptor after
+        closing it.
+        * Platform/IPC/unix/ConnectionUnix.cpp:
+        (IPC::Connection::processMessage): Use
+        SharedMemory::Handle::adoptAttachment() that receives an
+        IPC::Attachment now.
+        (IPC::Connection::sendOutgoingMessage): Use
+        SharedMemory::Handle::releaseAttachment().
+        * Platform/SharedMemory.h:
+        * Platform/unix/SharedMemoryUnix.cpp:
+        (WebKit::SharedMemory::Handle::Handle): Remove initializers for
+        file descriptor and size members.
+        (WebKit::SharedMemory::Handle::clear): Dispose the attachment.
+        (WebKit::SharedMemory::Handle::isNull): Handle is null if the
+        attachment file descriptor is -1.
+        (WebKit::SharedMemory::Handle::encode): Use releaseAttachment().
+        (WebKit::SharedMemory::Handle::decode): Use adoptAttachment().
+        (WebKit::SharedMemory::Handle::releaseAttachment): Implement it
+        using move.
+        (WebKit::SharedMemory::Handle::adoptAttachment): Ditto.
+        (WebKit::SharedMemory::map): Use
+        IPC::Attachment::releaseFileDescriptor() instead of manually
+        changing the member.
+        (WebKit::SharedMemory::createHandle): Initialize the handle
+        attachment with the duplicated file descriptor and size.
+
</ins><span class="cx"> 2015-04-22  Darin Adler  &lt;darin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove OwnPtr and PassOwnPtr use from WebKit/cf, WebKit/mac, and WebKit2
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCAttachmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Attachment.h (183175 => 183176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Attachment.h        2015-04-23 07:24:57 UTC (rev 183175)
+++ trunk/Source/WebKit2/Platform/IPC/Attachment.h        2015-04-23 07:28:48 UTC (rev 183176)
</span><span class="lines">@@ -53,6 +53,10 @@
</span><span class="cx"> #if OS(DARWIN)
</span><span class="cx">     Attachment(mach_port_name_t port, mach_msg_type_name_t disposition);
</span><span class="cx"> #elif USE(UNIX_DOMAIN_SOCKETS)
</span><ins>+    Attachment(Attachment&amp;&amp;);
+    Attachment&amp; operator=(Attachment&amp;&amp;);
+    Attachment(const Attachment&amp;) = default;
+    Attachment&amp; operator=(Attachment&amp;) = default;
</ins><span class="cx">     Attachment(int fileDescriptor, size_t);
</span><span class="cx">     Attachment(int fileDescriptor);
</span><span class="cx"> #endif
</span><span class="lines">@@ -85,7 +89,7 @@
</span><span class="cx">     mach_port_name_t m_port;
</span><span class="cx">     mach_msg_type_name_t m_disposition;
</span><span class="cx"> #elif USE(UNIX_DOMAIN_SOCKETS)
</span><del>-    int m_fileDescriptor;
</del><ins>+    int m_fileDescriptor { -1 };
</ins><span class="cx">     size_t m_size;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (183175 => 183176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h        2015-04-23 07:24:57 UTC (rev 183175)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h        2015-04-23 07:28:48 UTC (rev 183176)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx">     pid_t remoteProcessID() const;
</span><span class="cx"> #elif USE(UNIX_DOMAIN_SOCKETS)
</span><span class="cx">     typedef int Identifier;
</span><del>-    static bool identifierIsNull(Identifier identifier) { return !identifier; }
</del><ins>+    static bool identifierIsNull(Identifier identifier) { return identifier == -1; }
</ins><span class="cx"> 
</span><span class="cx">     struct SocketPair {
</span><span class="cx">         int client;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCunixAttachmentUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/unix/AttachmentUnix.cpp (183175 => 183176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/unix/AttachmentUnix.cpp        2015-04-23 07:24:57 UTC (rev 183175)
+++ trunk/Source/WebKit2/Platform/IPC/unix/AttachmentUnix.cpp        2015-04-23 07:28:48 UTC (rev 183176)
</span><span class="lines">@@ -45,10 +45,35 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+Attachment::Attachment(Attachment&amp;&amp; attachment)
+    : m_type(attachment.m_type)
+    , m_fileDescriptor(attachment.m_fileDescriptor)
+    , m_size(attachment.m_size)
+{
+    attachment.m_type = Uninitialized;
+    attachment.m_fileDescriptor = -1;
+    attachment.m_size = 0;
+}
+
+Attachment&amp; Attachment::operator=(Attachment&amp;&amp; attachment)
+{
+    m_type = attachment.m_type;
+    attachment.m_type = Uninitialized;
+    m_fileDescriptor = attachment.m_fileDescriptor;
+    attachment.m_fileDescriptor = -1;
+    m_size = attachment.m_size;
+    attachment.m_size = 0;
+
+    return *this;
+}
+
</ins><span class="cx"> void Attachment::dispose()
</span><span class="cx"> {
</span><del>-    if (m_fileDescriptor != -1)
-        closeWithRetry(m_fileDescriptor);
</del><ins>+    if (m_fileDescriptor == -1)
+        return;
+
+    closeWithRetry(m_fileDescriptor);
+    m_fileDescriptor = -1;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace IPC
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCunixConnectionUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp (183175 => 183176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp        2015-04-23 07:24:57 UTC (rev 183175)
+++ trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp        2015-04-23 07:28:48 UTC (rev 183176)
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         WebKit::SharedMemory::Handle handle;
</span><del>-        handle.adoptFromAttachment(m_fileDescriptors[attachmentFileDescriptorCount - 1], attachmentInfo[attachmentCount].getSize());
</del><ins>+        handle.adoptAttachment(IPC::Attachment(m_fileDescriptors[attachmentFileDescriptorCount - 1], attachmentInfo[attachmentCount].getSize()));
</ins><span class="cx"> 
</span><span class="cx">         oolMessageBody = WebKit::SharedMemory::map(handle, WebKit::SharedMemory::Protection::ReadOnly);
</span><span class="cx">         if (!oolMessageBody) {
</span><span class="lines">@@ -445,7 +445,7 @@
</span><span class="cx"> 
</span><span class="cx">         memcpy(oolMessageBody-&gt;data(), encoder-&gt;buffer(), encoder-&gt;bufferSize());
</span><span class="cx"> 
</span><del>-        attachments.append(handle.releaseToAttachment());
</del><ins>+        attachments.append(handle.releaseAttachment());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     struct msghdr message;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformSharedMemoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/SharedMemory.h (183175 => 183176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/SharedMemory.h        2015-04-23 07:24:57 UTC (rev 183175)
+++ trunk/Source/WebKit2/Platform/SharedMemory.h        2015-04-23 07:28:48 UTC (rev 183176)
</span><span class="lines">@@ -69,17 +69,17 @@
</span><span class="cx">         static bool decode(IPC::ArgumentDecoder&amp;, Handle&amp;);
</span><span class="cx"> 
</span><span class="cx"> #if USE(UNIX_DOMAIN_SOCKETS)
</span><del>-        IPC::Attachment releaseToAttachment() const;
-        void adoptFromAttachment(int fileDescriptor, size_t);
</del><ins>+        IPC::Attachment releaseAttachment() const;
+        void adoptAttachment(IPC::Attachment&amp;&amp;);
</ins><span class="cx"> #endif
</span><span class="cx">     private:
</span><span class="cx">         friend class SharedMemory;
</span><span class="cx"> #if OS(DARWIN)
</span><span class="cx">         mutable mach_port_t m_port;
</span><ins>+        size_t m_size;
</ins><span class="cx"> #elif USE(UNIX_DOMAIN_SOCKETS)
</span><del>-        mutable int m_fileDescriptor;
</del><ins>+        mutable IPC::Attachment m_attachment;
</ins><span class="cx"> #endif
</span><del>-        size_t m_size;
</del><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     static RefPtr&lt;SharedMemory&gt; allocate(size_t);
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformunixSharedMemoryUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp (183175 => 183176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp        2015-04-23 07:24:57 UTC (rev 183175)
+++ trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp        2015-04-23 07:28:48 UTC (rev 183176)
</span><span class="lines">@@ -47,8 +47,6 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><span class="cx"> SharedMemory::Handle::Handle()
</span><del>-    : m_fileDescriptor(-1)
-    , m_size(0)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -59,18 +57,17 @@
</span><span class="cx"> 
</span><span class="cx"> void SharedMemory::Handle::clear()
</span><span class="cx"> {
</span><del>-    if (!isNull())
-        closeWithRetry(m_fileDescriptor);
</del><ins>+    m_attachment.dispose();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool SharedMemory::Handle::isNull() const
</span><span class="cx"> {
</span><del>-    return m_fileDescriptor == -1;
</del><ins>+    return m_attachment.fileDescriptor() == -1;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void SharedMemory::Handle::encode(IPC::ArgumentEncoder&amp; encoder) const
</span><span class="cx"> {
</span><del>-    encoder &lt;&lt; releaseToAttachment();
</del><ins>+    encoder &lt;&lt; releaseAttachment();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool SharedMemory::Handle::decode(IPC::ArgumentDecoder&amp; decoder, Handle&amp; handle)
</span><span class="lines">@@ -82,24 +79,21 @@
</span><span class="cx">     if (!decoder.decode(attachment))
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><del>-    handle.adoptFromAttachment(attachment.releaseFileDescriptor(), attachment.size());
</del><ins>+    handle.adoptAttachment(WTF::move(attachment));
</ins><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-IPC::Attachment SharedMemory::Handle::releaseToAttachment() const
</del><ins>+IPC::Attachment SharedMemory::Handle::releaseAttachment() const
</ins><span class="cx"> {
</span><del>-    int temp = m_fileDescriptor;
-    m_fileDescriptor = -1;
-    return IPC::Attachment(temp, m_size);
</del><ins>+    ASSERT(!isNull());
+    return WTF::move(m_attachment);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void SharedMemory::Handle::adoptFromAttachment(int fileDescriptor, size_t size)
</del><ins>+void SharedMemory::Handle::adoptAttachment(IPC::Attachment&amp;&amp; attachment)
</ins><span class="cx"> {
</span><del>-    ASSERT(!m_size);
</del><span class="cx">     ASSERT(isNull());
</span><span class="cx"> 
</span><del>-    m_fileDescriptor = fileDescriptor;
-    m_size = size;
</del><ins>+    m_attachment = WTF::move(attachment);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> RefPtr&lt;SharedMemory&gt; SharedMemory::allocate(size_t size)
</span><span class="lines">@@ -161,15 +155,14 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!handle.isNull());
</span><span class="cx"> 
</span><del>-    void* data = mmap(0, handle.m_size, accessModeMMap(protection), MAP_SHARED, handle.m_fileDescriptor, 0);
</del><ins>+    void* data = mmap(0, handle.m_attachment.size(), accessModeMMap(protection), MAP_SHARED, handle.m_attachment.fileDescriptor(), 0);
</ins><span class="cx">     if (data == MAP_FAILED)
</span><del>-        return 0;
</del><ins>+        return nullptr;
</ins><span class="cx"> 
</span><span class="cx">     RefPtr&lt;SharedMemory&gt; instance = adoptRef(new SharedMemory());
</span><span class="cx">     instance-&gt;m_data = data;
</span><del>-    instance-&gt;m_fileDescriptor = handle.m_fileDescriptor;
-    instance-&gt;m_size = handle.m_size;
-    handle.m_fileDescriptor = -1;
</del><ins>+    instance-&gt;m_fileDescriptor = handle.m_attachment.releaseFileDescriptor();
+    instance-&gt;m_size = handle.m_attachment.size();
</ins><span class="cx">     return instance;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -202,8 +195,7 @@
</span><span class="cx">             return false;
</span><span class="cx">         }
</span><span class="cx">     }
</span><del>-    handle.m_fileDescriptor = duplicatedHandle;
-    handle.m_size = m_size;
</del><ins>+    handle.m_attachment = IPC::Attachment(duplicatedHandle, m_size);
</ins><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>