<!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>[177521] trunk/Source</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/177521">177521</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-18 13:31:03 -0800 (Thu, 18 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up MachSendRight and add a copySendRight member function
https://bugs.webkit.org/show_bug.cgi?id=139788
Reviewed by Tim Horton.
Source/WebCore:
* platform/cocoa/MachSendRight.cpp:
(WebCore::retainSendRight):
(WebCore::releaseSendRight):
Use mach_error_string.
(WebCore::MachSendRight::copySendRight):
Create a new send right with the given mach port.
(WebCore::MachSendRight::leakSendRight):
Use std::exchange.
* platform/cocoa/MachSendRight.h:
Source/WTF:
* wtf/StdLibExtras.h:
(std::exchange):
Add an implementation of std::exchange.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfStdLibExtrash">trunk/Source/WTF/wtf/StdLibExtras.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaMachSendRightcpp">trunk/Source/WebCore/platform/cocoa/MachSendRight.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaMachSendRighth">trunk/Source/WebCore/platform/cocoa/MachSendRight.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (177520 => 177521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-12-18 21:29:23 UTC (rev 177520)
+++ trunk/Source/WTF/ChangeLog 2014-12-18 21:31:03 UTC (rev 177521)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-12-18 Anders Carlsson <andersca@apple.com>
+
+ Clean up MachSendRight and add a copySendRight member function
+ https://bugs.webkit.org/show_bug.cgi?id=139788
+
+ Reviewed by Tim Horton.
+
+ * wtf/StdLibExtras.h:
+ (std::exchange):
+ Add an implementation of std::exchange.
+
</ins><span class="cx"> 2014-12-17 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Make it possible to toggle FeatureCounter support at runtime
</span></span></pre></div>
<a id="trunkSourceWTFwtfStdLibExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/StdLibExtras.h (177520 => 177521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/StdLibExtras.h 2014-12-18 21:29:23 UTC (rev 177520)
+++ trunk/Source/WTF/wtf/StdLibExtras.h 2014-12-18 21:31:03 UTC (rev 177521)
</span><span class="lines">@@ -367,6 +367,16 @@
</span><span class="cx">
</span><span class="cx"> template<size_t length> struct make_index_sequence : public make_index_sequence_helper<length>::type { };
</span><span class="cx">
</span><ins>+// std::exchange
+template<class T, class U = T>
+T exchange(T& t, U&& newValue)
+{
+ T oldValue = std::move(t);
+ t = std::forward<U>(newValue);
+
+ return oldValue;
+}
+
</ins><span class="cx"> #if COMPILER_SUPPORTS(CXX_USER_LITERALS)
</span><span class="cx"> // These literals are available in C++14, so once we require C++14 compilers we can get rid of them here.
</span><span class="cx"> // (User-literals need to have a leading underscore so we add it here - the "real" literals don't have underscores).
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177520 => 177521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-18 21:29:23 UTC (rev 177520)
+++ trunk/Source/WebCore/ChangeLog 2014-12-18 21:31:03 UTC (rev 177521)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-12-18 Anders Carlsson <andersca@apple.com>
+
+ Clean up MachSendRight and add a copySendRight member function
+ https://bugs.webkit.org/show_bug.cgi?id=139788
+
+ Reviewed by Tim Horton.
+
+ * platform/cocoa/MachSendRight.cpp:
+ (WebCore::retainSendRight):
+ (WebCore::releaseSendRight):
+ Use mach_error_string.
+
+ (WebCore::MachSendRight::copySendRight):
+ Create a new send right with the given mach port.
+
+ (WebCore::MachSendRight::leakSendRight):
+ Use std::exchange.
+
+ * platform/cocoa/MachSendRight.h:
+
</ins><span class="cx"> 2014-12-18 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: ASSERT seen closing/opening multiple inspectors
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaMachSendRightcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/MachSendRight.cpp (177520 => 177521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/MachSendRight.cpp 2014-12-18 21:29:23 UTC (rev 177520)
+++ trunk/Source/WebCore/platform/cocoa/MachSendRight.cpp 2014-12-18 21:31:03 UTC (rev 177521)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "MachSendRight.h"
</span><span class="cx">
</span><ins>+#include <mach/mach_error.h>
</ins><span class="cx"> #include <utility>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -37,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> auto kr = mach_port_mod_refs(mach_task_self(), port, MACH_PORT_RIGHT_SEND, 1);
</span><span class="cx"> if (kr != KERN_SUCCESS)
</span><del>- LOG_ERROR("mach_port_mod_refs error: %x", kr);
</del><ins>+ LOG_ERROR("mach_port_mod_refs error: %s (%x)", mach_error_string(kr), kr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void releaseSendRight(mach_port_t port)
</span><span class="lines">@@ -47,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> auto kr = mach_port_deallocate(mach_task_self(), port);
</span><span class="cx"> if (kr != KERN_SUCCESS)
</span><del>- LOG_ERROR("mach_port_deallocate error: %x", kr);
</del><ins>+ LOG_ERROR("mach_port_deallocate error: %s (%x)", mach_error_string(kr), kr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MachSendRight MachSendRight::adopt(mach_port_t port)
</span><span class="lines">@@ -87,12 +88,14 @@
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+MachSendRight MachSendRight::copySendRight() const
+{
+ return create(m_port);
+}
+
</ins><span class="cx"> mach_port_t MachSendRight::leakSendRight()
</span><span class="cx"> {
</span><del>- mach_port_t port = m_port;
- m_port = MACH_PORT_NULL;
-
- return port;
</del><ins>+ return std::exchange(m_port, MACH_PORT_NULL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaMachSendRighth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/MachSendRight.h (177520 => 177521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/MachSendRight.h 2014-12-18 21:29:23 UTC (rev 177520)
+++ trunk/Source/WebCore/platform/cocoa/MachSendRight.h 2014-12-18 21:31:03 UTC (rev 177521)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx">
</span><span class="cx"> MachSendRight& operator=(MachSendRight&&);
</span><span class="cx">
</span><ins>+ MachSendRight copySendRight() const;
+
</ins><span class="cx"> mach_port_t leakSendRight() WARN_UNUSED_RETURN;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>
</body>
</html>