<!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>[174809] trunk</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/174809">174809</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-10-16 22:14:25 -0700 (Thu, 16 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>OSObjectPtr is missing leakRef()
https://bugs.webkit.org/show_bug.cgi?id=137798
Reviewed by Sam Weinig.
Source/WTF:
* wtf/OSObjectPtr.h:
Tools:
* TestWebKitAPI/Tests/WTF/darwin/OSObjectPtr.cpp:
(TestWebKitAPI::TEST(OSObjectPtr, LeakRef)): Added.</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>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFdarwinOSObjectPtrcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/darwin/OSObjectPtr.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (174808 => 174809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-10-17 03:26:22 UTC (rev 174808)
+++ trunk/Source/WTF/ChangeLog 2014-10-17 05:14:25 UTC (rev 174809)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-10-16 Dan Bernstein <mitz@apple.com>
+
+ OSObjectPtr is missing leakRef()
+ https://bugs.webkit.org/show_bug.cgi?id=137798
+
+ Reviewed by Sam Weinig.
+
+ * wtf/OSObjectPtr.h:
+
</ins><span class="cx"> 2014-10-14 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed gardening. Ignore Visual Studio *.sdf files.
</span></span></pre></div>
<a id="trunkSourceWTFwtfOSObjectPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/OSObjectPtr.h (174808 => 174809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/OSObjectPtr.h 2014-10-17 03:26:22 UTC (rev 174808)
+++ trunk/Source/WTF/wtf/OSObjectPtr.h 2014-10-17 05:14:25 UTC (rev 174809)
</span><span class="lines">@@ -141,6 +141,13 @@
</span><span class="cx"> std::swap(m_ptr, other.m_ptr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ T leakRef() WARN_UNUSED_RETURN
+ {
+ T ptr = m_ptr;
+ m_ptr = nullptr;
+ return ptr;
+ }
+
</ins><span class="cx"> friend OSObjectPtr adoptOSObject<T>(T);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (174808 => 174809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-10-17 03:26:22 UTC (rev 174808)
+++ trunk/Tools/ChangeLog 2014-10-17 05:14:25 UTC (rev 174809)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-10-16 Dan Bernstein <mitz@apple.com>
+
+ OSObjectPtr is missing leakRef()
+ https://bugs.webkit.org/show_bug.cgi?id=137798
+
+ Reviewed by Sam Weinig.
+
+ * TestWebKitAPI/Tests/WTF/darwin/OSObjectPtr.cpp:
+ (TestWebKitAPI::TEST(OSObjectPtr, LeakRef)): Added.
+
</ins><span class="cx"> 2014-10-16 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Update target platform to remove Leopard, Snow Leopard, Lion.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFdarwinOSObjectPtrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/darwin/OSObjectPtr.cpp (174808 => 174809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/darwin/OSObjectPtr.cpp 2014-10-17 03:26:22 UTC (rev 174808)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/darwin/OSObjectPtr.cpp 2014-10-17 05:14:25 UTC (rev 174809)
</span><span class="lines">@@ -51,4 +51,16 @@
</span><span class="cx"> EXPECT_EQ(1, CFGetRetainCount(foo));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(OSObjectPtr, LeakRef)
+{
+ OSObjectPtr<dispatch_queue_t> foo = adoptOSObject(dispatch_queue_create(0, DISPATCH_QUEUE_SERIAL));
+ EXPECT_EQ(1, CFGetRetainCount(foo.get()));
+
+ dispatch_queue_t queue = foo.leakRef();
+ EXPECT_EQ(nullptr, foo.get());
+ EXPECT_EQ(1, CFGetRetainCount(queue));
+
+ WTF::releaseOSObject(queue);
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>