<!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>[203257] 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/203257">203257</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-14 17:00:36 -0700 (Thu, 14 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow RefPtrs of const RefCounted types
https://bugs.webkit.org/show_bug.cgi?id=158269
Patch by Alex Christensen <achristensen@webkit.org> on 2016-07-14
Reviewed by Anders Carlsson.
Source/WTF:
* wtf/RefCounted.h:
(WTF::RefCountedBase::ref):
(WTF::RefCountedBase::~RefCountedBase):
(WTF::RefCountedBase::derefBase):
(WTF::RefCounted::deref):
Creating references to a const object does not really modify the object,
so everything in RefCounted is now mutable, and ref and deref are const.
Tools:
* TestWebKitAPI/Tests/WTF/RefPtr.cpp:
(TestWebKitAPI::TEST):
(TestWebKitAPI::ConstRefCounted::create):
(TestWebKitAPI::returnConstRefCountedRef):
(TestWebKitAPI::returnRefCountedRef):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfRefCountedh">trunk/Source/WTF/wtf/RefCounted.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFRefPtrcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/RefPtr.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (203256 => 203257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-07-14 23:46:55 UTC (rev 203256)
+++ trunk/Source/WTF/ChangeLog 2016-07-15 00:00:36 UTC (rev 203257)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-07-14 Alex Christensen <achristensen@webkit.org>
+
+ Allow RefPtrs of const RefCounted types
+ https://bugs.webkit.org/show_bug.cgi?id=158269
+
+ Reviewed by Anders Carlsson.
+
+ * wtf/RefCounted.h:
+ (WTF::RefCountedBase::ref):
+ (WTF::RefCountedBase::~RefCountedBase):
+ (WTF::RefCountedBase::derefBase):
+ (WTF::RefCounted::deref):
+ Creating references to a const object does not really modify the object,
+ so everything in RefCounted is now mutable, and ref and deref are const.
+
</ins><span class="cx"> 2016-07-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Avoid an extra heap allocation when dispatching Functions to WorkQueue
</span></span></pre></div>
<a id="trunkSourceWTFwtfRefCountedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RefCounted.h (203256 => 203257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RefCounted.h 2016-07-14 23:46:55 UTC (rev 203256)
+++ trunk/Source/WTF/wtf/RefCounted.h 2016-07-15 00:00:36 UTC (rev 203257)
</span><span class="lines">@@ -18,8 +18,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RefCounted_h
-#define RefCounted_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="lines">@@ -38,7 +37,7 @@
</span><span class="cx"> // generated by the compiler (technique called template hoisting).
</span><span class="cx"> class RefCountedBase {
</span><span class="cx"> public:
</span><del>- void ref()
</del><ins>+ void ref() const
</ins><span class="cx"> {
</span><span class="cx"> #if CHECK_REF_COUNTED_LIFECYCLE
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(!m_deletionHasBegun);
</span><span class="lines">@@ -88,7 +87,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Returns whether the pointer should be freed or not.
</span><del>- bool derefBase()
</del><ins>+ bool derefBase() const
</ins><span class="cx"> {
</span><span class="cx"> #if CHECK_REF_COUNTED_LIFECYCLE
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(!m_deletionHasBegun);
</span><span class="lines">@@ -120,10 +119,10 @@
</span><span class="cx"> friend void adopted(RefCountedBase*);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- unsigned m_refCount;
</del><ins>+ mutable unsigned m_refCount;
</ins><span class="cx"> #if CHECK_REF_COUNTED_LIFECYCLE
</span><del>- bool m_deletionHasBegun;
- bool m_adoptionIsRequired;
</del><ins>+ mutable bool m_deletionHasBegun;
+ mutable bool m_adoptionIsRequired;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -140,10 +139,10 @@
</span><span class="cx"> template<typename T> class RefCounted : public RefCountedBase {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(RefCounted); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- void deref()
</del><ins>+ void deref() const
</ins><span class="cx"> {
</span><span class="cx"> if (derefBase())
</span><del>- delete static_cast<T*>(this);
</del><ins>+ delete static_cast<const T*>(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -156,5 +155,3 @@
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> using WTF::RefCounted;
</span><del>-
-#endif // RefCounted_h
</del></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (203256 => 203257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-07-14 23:46:55 UTC (rev 203256)
+++ trunk/Tools/ChangeLog 2016-07-15 00:00:36 UTC (rev 203257)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-07-14 Alex Christensen <achristensen@webkit.org>
+
+ Allow RefPtrs of const RefCounted types
+ https://bugs.webkit.org/show_bug.cgi?id=158269
+
+ Reviewed by Anders Carlsson.
+
+ * TestWebKitAPI/Tests/WTF/RefPtr.cpp:
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::ConstRefCounted::create):
+ (TestWebKitAPI::returnConstRefCountedRef):
+ (TestWebKitAPI::returnRefCountedRef):
+
</ins><span class="cx"> 2016-07-13 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Test WTF.StringViewIterators is crashing since r203119
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFRefPtrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/RefPtr.cpp (203256 => 203257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/RefPtr.cpp 2016-07-14 23:46:55 UTC (rev 203256)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/RefPtr.cpp 2016-07-15 00:00:36 UTC (rev 203257)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><span class="cx"> #include "RefLogger.h"
</span><ins>+#include <wtf/NeverDestroyed.h>
+#include <wtf/RefCounted.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="lines">@@ -403,4 +405,34 @@
</span><span class="cx"> ASSERT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+struct ConstRefCounted : RefCounted<ConstRefCounted> {
+ static Ref<ConstRefCounted> create() { return adoptRef(*new ConstRefCounted); }
+};
+
+const ConstRefCounted& returnConstRefCountedRef()
+{
+ static NeverDestroyed<ConstRefCounted> instance;
+ return instance.get();
+}
+ConstRefCounted& returnRefCountedRef()
+{
+ static NeverDestroyed<ConstRefCounted> instance;
+ return instance.get();
+}
+
+TEST(WTF_RefPtr, Const)
+{
+ // This test passes if it compiles without an error.
+ auto a = ConstRefCounted::create();
+ Ref<const ConstRefCounted> b = WTFMove(a);
+ RefPtr<const ConstRefCounted> c = b.ptr();
+ Ref<const ConstRefCounted> d = returnConstRefCountedRef();
+ RefPtr<const ConstRefCounted> e = &returnConstRefCountedRef();
+ RefPtr<ConstRefCounted> f = ConstRefCounted::create();
+ RefPtr<const ConstRefCounted> g = f;
+ RefPtr<const ConstRefCounted> h(f);
+ Ref<const ConstRefCounted> i(returnRefCountedRef());
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>