<!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>[197143] 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/197143">197143</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-25 15:59:21 -0800 (Thu, 25 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/197137">r197137</a>.
https://bugs.webkit.org/show_bug.cgi?id=154700
broke windows build (Requested by alexchristensen on #webkit).
Reverted changeset:
"Replace RefCounter::Token implementation with RefPtr"
https://bugs.webkit.org/show_bug.cgi?id=154698
http://trac.webkit.org/changeset/197137</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfRefCounterh">trunk/Source/WTF/wtf/RefCounter.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (197142 => 197143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-02-25 23:52:07 UTC (rev 197142)
+++ trunk/Source/WTF/ChangeLog 2016-02-25 23:59:21 UTC (rev 197143)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-02-25 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r197137.
+ https://bugs.webkit.org/show_bug.cgi?id=154700
+
+ broke windows build (Requested by alexchristensen on #webkit).
+
+ Reverted changeset:
+
+ "Replace RefCounter::Token implementation with RefPtr"
+ https://bugs.webkit.org/show_bug.cgi?id=154698
+ http://trac.webkit.org/changeset/197137
+
</ins><span class="cx"> 2016-02-25 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace RefCounter::Token implementation with RefPtr
</span></span></pre></div>
<a id="trunkSourceWTFwtfRefCounterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RefCounter.h (197142 => 197143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RefCounter.h 2016-02-25 23:52:07 UTC (rev 197142)
+++ trunk/Source/WTF/wtf/RefCounter.h 2016-02-25 23:59:21 UTC (rev 197143)
</span><span class="lines">@@ -56,14 +56,32 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- using Token = RefPtr<Count>;
</del><ins>+ class Token {
+ public:
+ Token() { }
+ Token(std::nullptr_t) { }
+ inline Token(const Token&);
+ inline Token(Token&&);
</ins><span class="cx">
</span><ins>+ inline Token& operator=(std::nullptr_t);
+ inline Token& operator=(const Token&);
+ inline Token& operator=(Token&&);
+
+ explicit operator bool() const { return m_ptr; }
+
+ private:
+ friend class RefCounter;
+ inline Token(Count* count);
+
+ RefPtr<Count> m_ptr;
+ };
+
</ins><span class="cx"> WTF_EXPORT_PRIVATE RefCounter(std::function<void(bool)> = [](bool) { });
</span><span class="cx"> WTF_EXPORT_PRIVATE ~RefCounter();
</span><span class="cx">
</span><span class="cx"> Token count() const
</span><span class="cx"> {
</span><del>- return m_count;
</del><ins>+ return Token(m_count);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned value() const
</span><span class="lines">@@ -125,6 +143,45 @@
</span><span class="cx"> delete m_count;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<class T>
+inline RefCounter<T>::Token::Token(Count* count)
+ : m_ptr(count)
+{
+}
+
+template<class T>
+inline RefCounter<T>::Token::Token(const RefCounter::Token& token)
+ : m_ptr(token.m_ptr)
+{
+}
+
+template<class T>
+inline RefCounter<T>::Token::Token(RefCounter::Token&& token)
+ : m_ptr(token.m_ptr)
+{
+}
+
+template<class T>
+inline typename RefCounter<T>::Token& RefCounter<T>::Token::operator=(std::nullptr_t)
+{
+ m_ptr = nullptr;
+ return *this;
+}
+
+template<class T>
+inline typename RefCounter<T>::Token& RefCounter<T>::Token::operator=(const RefCounter<T>::Token& token)
+{
+ m_ptr = token.m_ptr;
+ return *this;
+}
+
+template<class T>
+inline typename RefCounter<T>::Token& RefCounter<T>::Token::operator=(RefCounter<T>::Token&& token)
+{
+ m_ptr = token.m_ptr;
+ return *this;
+}
+
</ins><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> using WTF::RefCounter;
</span></span></pre>
</div>
</div>
</body>
</html>