<!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>[177523] trunk/Source/WTF</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/177523">177523</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-18 14:27:18 -0800 (Thu, 18 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify smart pointer classes by using std::exchange
https://bugs.webkit.org/show_bug.cgi?id=139790
Reviewed by Andreas Kling.
* wtf/MallocPtr.h:
* wtf/OSObjectPtr.h:
* wtf/OwnPtr.h:
(WTF::OwnPtr<T>::clear):
(WTF::OwnPtr<T>::release):
(WTF::OwnPtr<T>::leakPtr):
(WTF::=):
* wtf/PassOwnPtr.h:
(WTF::PassOwnPtr<T>::leakPtr):
* wtf/PassRefPtr.h:
(WTF::PassRefPtr<T>::leakRef):
* wtf/Ref.h:
* wtf/RefPtr.h:
(WTF::RefPtr<T>::clear):
(WTF::RefPtr<T>::leakRef):
* wtf/RetainPtr.h:
(WTF::RetainPtr<T>::leakRef):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfMallocPtrh">trunk/Source/WTF/wtf/MallocPtr.h</a></li>
<li><a href="#trunkSourceWTFwtfOSObjectPtrh">trunk/Source/WTF/wtf/OSObjectPtr.h</a></li>
<li><a href="#trunkSourceWTFwtfOwnPtrh">trunk/Source/WTF/wtf/OwnPtr.h</a></li>
<li><a href="#trunkSourceWTFwtfPassOwnPtrh">trunk/Source/WTF/wtf/PassOwnPtr.h</a></li>
<li><a href="#trunkSourceWTFwtfPassRefPtrh">trunk/Source/WTF/wtf/PassRefPtr.h</a></li>
<li><a href="#trunkSourceWTFwtfRefh">trunk/Source/WTF/wtf/Ref.h</a></li>
<li><a href="#trunkSourceWTFwtfRefPtrh">trunk/Source/WTF/wtf/RefPtr.h</a></li>
<li><a href="#trunkSourceWTFwtfRetainPtrh">trunk/Source/WTF/wtf/RetainPtr.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (177522 => 177523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-12-18 22:14:18 UTC (rev 177522)
+++ trunk/Source/WTF/ChangeLog 2014-12-18 22:27:18 UTC (rev 177523)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-12-18 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Simplify smart pointer classes by using std::exchange
+ https://bugs.webkit.org/show_bug.cgi?id=139790
+
+ Reviewed by Andreas Kling.
+
+ * wtf/MallocPtr.h:
+ * wtf/OSObjectPtr.h:
+ * wtf/OwnPtr.h:
+ (WTF::OwnPtr<T>::clear):
+ (WTF::OwnPtr<T>::release):
+ (WTF::OwnPtr<T>::leakPtr):
+ (WTF::=):
+ * wtf/PassOwnPtr.h:
+ (WTF::PassOwnPtr<T>::leakPtr):
+ * wtf/PassRefPtr.h:
+ (WTF::PassRefPtr<T>::leakRef):
+ * wtf/Ref.h:
+ * wtf/RefPtr.h:
+ (WTF::RefPtr<T>::clear):
+ (WTF::RefPtr<T>::leakRef):
+ * wtf/RetainPtr.h:
+ (WTF::RetainPtr<T>::leakRef):
+
+2014-12-18 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Clean up MachSendRight and add a copySendRight member function
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139788
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfMallocPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MallocPtr.h (177522 => 177523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MallocPtr.h 2014-12-18 22:14:18 UTC (rev 177522)
+++ trunk/Source/WTF/wtf/MallocPtr.h 2014-12-18 22:27:18 UTC (rev 177523)
</span><span class="lines">@@ -61,9 +61,7 @@
</span><span class="cx">
</span><span class="cx"> T *leakPtr() WARN_UNUSED_RETURN
</span><span class="cx"> {
</span><del>- T* ptr = m_ptr;
- m_ptr = nullptr;
- return ptr;
</del><ins>+ return std::exchange(m_ptr, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool operator!() const
</span></span></pre></div>
<a id="trunkSourceWTFwtfOSObjectPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/OSObjectPtr.h (177522 => 177523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/OSObjectPtr.h 2014-12-18 22:14:18 UTC (rev 177522)
+++ trunk/Source/WTF/wtf/OSObjectPtr.h 2014-12-18 22:27:18 UTC (rev 177523)
</span><span class="lines">@@ -143,9 +143,7 @@
</span><span class="cx">
</span><span class="cx"> T leakRef() WARN_UNUSED_RETURN
</span><span class="cx"> {
</span><del>- T ptr = m_ptr;
- m_ptr = nullptr;
- return ptr;
</del><ins>+ return std::exchange(m_ptr, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> friend OSObjectPtr adoptOSObject<T>(T);
</span></span></pre></div>
<a id="trunkSourceWTFwtfOwnPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/OwnPtr.h (177522 => 177523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/OwnPtr.h 2014-12-18 22:14:18 UTC (rev 177522)
+++ trunk/Source/WTF/wtf/OwnPtr.h 2014-12-18 22:27:18 UTC (rev 177523)
</span><span class="lines">@@ -113,29 +113,22 @@
</span><span class="cx">
</span><span class="cx"> template<typename T> inline void OwnPtr<T>::clear()
</span><span class="cx"> {
</span><del>- PtrType ptr = m_ptr;
- m_ptr = 0;
- deleteOwnedPtr(ptr);
</del><ins>+ deleteOwnedPtr(std::exchange(m_ptr, nullptr));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T> inline PassOwnPtr<T> OwnPtr<T>::release()
</span><span class="cx"> {
</span><del>- PtrType ptr = m_ptr;
- m_ptr = 0;
- return adoptPtr(ptr);
</del><ins>+ return adoptPtr(std::exchange(m_ptr, nullptr));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T> inline typename OwnPtr<T>::PtrType OwnPtr<T>::leakPtr()
</span><span class="cx"> {
</span><del>- PtrType ptr = m_ptr;
- m_ptr = 0;
- return ptr;
</del><ins>+ return std::exchange(m_ptr, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T> inline OwnPtr<T>& OwnPtr<T>::operator=(const PassOwnPtr<T>& o)
</span><span class="cx"> {
</span><del>- PtrType ptr = m_ptr;
- m_ptr = o.leakPtr();
</del><ins>+ PtrType ptr = std::exchange(m_ptr, o.leakPtr());
</ins><span class="cx"> ASSERT(!ptr || m_ptr != ptr);
</span><span class="cx"> deleteOwnedPtr(ptr);
</span><span class="cx"> return *this;
</span><span class="lines">@@ -143,8 +136,7 @@
</span><span class="cx">
</span><span class="cx"> template<typename T> template<typename U> inline OwnPtr<T>& OwnPtr<T>::operator=(const PassOwnPtr<U>& o)
</span><span class="cx"> {
</span><del>- PtrType ptr = m_ptr;
- m_ptr = o.leakPtr();
</del><ins>+ PtrType ptr = std::exchange(m_ptr, o.leakPtr());
</ins><span class="cx"> ASSERT(!ptr || m_ptr != ptr);
</span><span class="cx"> deleteOwnedPtr(ptr);
</span><span class="cx"> return *this;
</span></span></pre></div>
<a id="trunkSourceWTFwtfPassOwnPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PassOwnPtr.h (177522 => 177523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PassOwnPtr.h 2014-12-18 22:14:18 UTC (rev 177522)
+++ trunk/Source/WTF/wtf/PassOwnPtr.h 2014-12-18 22:27:18 UTC (rev 177523)
</span><span class="lines">@@ -89,9 +89,7 @@
</span><span class="cx">
</span><span class="cx"> template<typename T> inline typename PassOwnPtr<T>::PtrType PassOwnPtr<T>::leakPtr() const
</span><span class="cx"> {
</span><del>- PtrType ptr = m_ptr;
- m_ptr = 0;
- return ptr;
</del><ins>+ return std::exchange(m_ptr, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U> inline bool operator==(const PassOwnPtr<T>& a, const PassOwnPtr<U>& b)
</span></span></pre></div>
<a id="trunkSourceWTFwtfPassRefPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PassRefPtr.h (177522 => 177523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PassRefPtr.h 2014-12-18 22:14:18 UTC (rev 177522)
+++ trunk/Source/WTF/wtf/PassRefPtr.h 2014-12-18 22:27:18 UTC (rev 177523)
</span><span class="lines">@@ -93,9 +93,7 @@
</span><span class="cx">
</span><span class="cx"> template<typename T> inline T* PassRefPtr<T>::leakRef() const
</span><span class="cx"> {
</span><del>- T* ptr = m_ptr;
- m_ptr = nullptr;
- return ptr;
</del><ins>+ return std::exchange(m_ptr, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U> inline bool operator==(const PassRefPtr<T>& a, const PassRefPtr<U>& b)
</span></span></pre></div>
<a id="trunkSourceWTFwtfRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Ref.h (177522 => 177523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Ref.h 2014-12-18 22:14:18 UTC (rev 177522)
+++ trunk/Source/WTF/wtf/Ref.h 2014-12-18 22:27:18 UTC (rev 177523)
</span><span class="lines">@@ -111,9 +111,8 @@
</span><span class="cx"> T& leakRef() WARN_UNUSED_RETURN
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_ptr);
</span><del>- T* movedPtr = m_ptr;
- m_ptr = nullptr;
- return *movedPtr;
</del><ins>+
+ return *std::exchange(m_ptr, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWTFwtfRefPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RefPtr.h (177522 => 177523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RefPtr.h 2014-12-18 22:14:18 UTC (rev 177522)
+++ trunk/Source/WTF/wtf/RefPtr.h 2014-12-18 22:27:18 UTC (rev 177523)
</span><span class="lines">@@ -111,18 +111,13 @@
</span><span class="cx">
</span><span class="cx"> template<typename T> inline void RefPtr<T>::clear()
</span><span class="cx"> {
</span><del>- T* ptr = m_ptr;
- m_ptr = nullptr;
- derefIfNotNull(ptr);
</del><ins>+ derefIfNotNull(std::exchange(m_ptr, nullptr));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="cx"> inline T* RefPtr<T>::leakRef()
</span><span class="cx"> {
</span><del>- T* ptr = m_ptr;
- m_ptr = nullptr;
-
- return ptr;
</del><ins>+ return std::exchange(m_ptr, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T> inline RefPtr<T>& RefPtr<T>::operator=(const RefPtr& o)
</span></span></pre></div>
<a id="trunkSourceWTFwtfRetainPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RetainPtr.h (177522 => 177523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RetainPtr.h 2014-12-18 22:14:18 UTC (rev 177522)
+++ trunk/Source/WTF/wtf/RetainPtr.h 2014-12-18 22:27:18 UTC (rev 177523)
</span><span class="lines">@@ -155,9 +155,7 @@
</span><span class="cx">
</span><span class="cx"> template<typename T> inline typename RetainPtr<T>::PtrType RetainPtr<T>::leakRef()
</span><span class="cx"> {
</span><del>- PtrType ptr = fromStorageType(m_ptr);
- m_ptr = nullptr;
- return ptr;
</del><ins>+ return fromStorageType(std::exchange(m_ptr, nullptr));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifdef __OBJC__
</span></span></pre>
</div>
</div>
</body>
</html>