<!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>[173383] 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/173383">173383</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-09-08 10:26:37 -0700 (Mon, 08 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make OSObjectPtr a bit more like RefPtr
https://bugs.webkit.org/show_bug.cgi?id=136613
Reviewed by Darin Adler.
Address some of Darin's feedback by:
- Making the adopting constructor private and friending adoptOSObject().
- Implementing the assignment operator using swap.
- Adding a move assignment operator.
* wtf/OSObjectPtr.h:
(WTF::OSObjectPtr::operator=):
(WTF::OSObjectPtr::swap):
(WTF::OSObjectPtr::OSObjectPtr):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfOSObjectPtrh">trunk/Source/WTF/wtf/OSObjectPtr.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (173382 => 173383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-09-08 17:10:01 UTC (rev 173382)
+++ trunk/Source/WTF/ChangeLog 2014-09-08 17:26:37 UTC (rev 173383)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-09-07 Sam Weinig <sam@webkit.org>
+
+ Make OSObjectPtr a bit more like RefPtr
+ https://bugs.webkit.org/show_bug.cgi?id=136613
+
+ Reviewed by Darin Adler.
+
+ Address some of Darin's feedback by:
+ - Making the adopting constructor private and friending adoptOSObject().
+ - Implementing the assignment operator using swap.
+ - Adding a move assignment operator.
+
+ * wtf/OSObjectPtr.h:
+ (WTF::OSObjectPtr::operator=):
+ (WTF::OSObjectPtr::swap):
+ (WTF::OSObjectPtr::OSObjectPtr):
+
</ins><span class="cx"> 2014-09-08 Jessie Berlin <jberlin@apple.com>
</span><span class="cx">
</span><span class="cx"> More build fixes after r173374.
</span></span></pre></div>
<a id="trunkSourceWTFwtfOSObjectPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/OSObjectPtr.h (173382 => 173383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/OSObjectPtr.h 2014-09-08 17:10:01 UTC (rev 173382)
+++ trunk/Source/WTF/wtf/OSObjectPtr.h 2014-09-08 17:26:37 UTC (rev 173383)
</span><span class="lines">@@ -49,7 +49,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><del>-struct AdoptOSObject { };
</del><ins>+template<typename T> class OSObjectPtr;
+template<typename T> OSObjectPtr<T> adoptOSObject(T);
</ins><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="cx"> static inline void retainOSObject(T ptr)
</span><span class="lines">@@ -86,11 +87,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- OSObjectPtr(AdoptOSObject, T ptr)
- : m_ptr(ptr)
- {
- }
-
</del><span class="cx"> ~OSObjectPtr()
</span><span class="cx"> {
</span><span class="cx"> if (m_ptr)
</span><span class="lines">@@ -117,16 +113,15 @@
</span><span class="cx">
</span><span class="cx"> OSObjectPtr& operator=(const OSObjectPtr& other)
</span><span class="cx"> {
</span><del>- T optr = other.get();
- if (optr)
- retainOSObject(optr);
</del><ins>+ OSObjectPtr ptr = other;
+ swap(ptr);
+ return *this;
+ }
</ins><span class="cx">
</span><del>- T ptr = m_ptr;
- m_ptr = optr;
-
- if (ptr)
- releaseOSObject(ptr);
-
</del><ins>+ OSObjectPtr& operator=(OSObjectPtr&& other)
+ {
+ OSObjectPtr ptr = WTF::move(other);
+ swap(ptr);
</ins><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -138,13 +133,27 @@
</span><span class="cx">
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><ins>+
+ void swap(OSObjectPtr& other)
+ {
+ std::swap(m_ptr, other.m_ptr);
+ }
+
+ friend OSObjectPtr adoptOSObject<T>(T);
+
</ins><span class="cx"> private:
</span><ins>+ struct AdoptOSObject { };
+ OSObjectPtr(AdoptOSObject, T ptr)
+ : m_ptr(ptr)
+ {
+ }
+
</ins><span class="cx"> T m_ptr;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename T> inline OSObjectPtr<T> adoptOSObject(T ptr)
</span><span class="cx"> {
</span><del>- return OSObjectPtr<T>(AdoptOSObject { }, ptr);
</del><ins>+ return OSObjectPtr<T>(typename OSObjectPtr<T>::AdoptOSObject { }, ptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span></span></pre>
</div>
</div>
</body>
</html>