<!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>[180535] 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/180535">180535</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-02-23 17:03:58 -0800 (Mon, 23 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WTF::WeakPtr should rename 'forgot' to 'clear' and support nullptr assignment
https://bugs.webkit.org/show_bug.cgi?id=141935
Reviewed by Myles C. Maxfield.
Source/WTF:
* wtf/WeakPtr.h:
(WTF::WeakPtr::operator=): Added 'nullptr_t' overload.
(WTF::WeakPtr::clear): Renamed from 'forget'
(WTF::WeakPtr::forget): Deleted.
Tools:
* TestWebKitAPI/Tests/WTF/WeakPtr.cpp:
(TestWebKitAPI::TEST): Updated for 'clear' method rename, and added a few
tests for assigning from nullptr.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfWeakPtrh">trunk/Source/WTF/wtf/WeakPtr.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFWeakPtrcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/WeakPtr.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (180534 => 180535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-02-24 00:55:53 UTC (rev 180534)
+++ trunk/Source/WTF/ChangeLog 2015-02-24 01:03:58 UTC (rev 180535)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-02-23 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ WTF::WeakPtr should rename 'forgot' to 'clear' and support nullptr assignment
+ https://bugs.webkit.org/show_bug.cgi?id=141935
+
+ Reviewed by Myles C. Maxfield.
+
+ * wtf/WeakPtr.h:
+ (WTF::WeakPtr::operator=): Added 'nullptr_t' overload.
+ (WTF::WeakPtr::clear): Renamed from 'forget'
+ (WTF::WeakPtr::forget): Deleted.
+
+2015-02-23 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> WTF::WeakPtr should have a 'forget' method
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141923
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfWeakPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WeakPtr.h (180534 => 180535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WeakPtr.h 2015-02-24 00:55:53 UTC (rev 180534)
+++ trunk/Source/WTF/wtf/WeakPtr.h 2015-02-24 01:03:58 UTC (rev 180535)
</span><span class="lines">@@ -100,10 +100,11 @@
</span><span class="cx">
</span><span class="cx"> WeakPtr& operator=(const WeakPtr& o) { m_ref = o.m_ref.copyRef(); return *this; }
</span><span class="cx"> template<typename U> WeakPtr& operator=(const WeakPtr<U>& o) { m_ref = o.m_ref.copyRef(); return *this; }
</span><ins>+ WeakPtr& operator=(std::nullptr_t) { m_ref = WeakReference<T>::create(nullptr); return *this; }
</ins><span class="cx">
</span><span class="cx"> T* operator->() const { return m_ref->get(); }
</span><span class="cx">
</span><del>- void forget() { m_ref = WeakReference<T>::create(nullptr); }
</del><ins>+ void clear() { m_ref = WeakReference<T>::create(nullptr); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class WeakPtrFactory<T>;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (180534 => 180535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-24 00:55:53 UTC (rev 180534)
+++ trunk/Tools/ChangeLog 2015-02-24 01:03:58 UTC (rev 180535)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2015-02-23 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ WTF::WeakPtr should rename 'forgot' to 'clear' and support nullptr assignment
+ https://bugs.webkit.org/show_bug.cgi?id=141935
+
+ Reviewed by Myles C. Maxfield.
+
+ * TestWebKitAPI/Tests/WTF/WeakPtr.cpp:
+ (TestWebKitAPI::TEST): Updated for 'clear' method rename, and added a few
+ tests for assigning from nullptr.
+
+2015-02-23 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> WTF::WeakPtr should have a 'forget' method.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141923
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFWeakPtrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/WeakPtr.cpp (180534 => 180535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/WeakPtr.cpp 2015-02-24 00:55:53 UTC (rev 180534)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/WeakPtr.cpp 2015-02-24 01:03:58 UTC (rev 180535)
</span><span class="lines">@@ -125,29 +125,41 @@
</span><span class="cx"> int dummy2 = 7;
</span><span class="cx">
</span><span class="cx"> WeakPtrFactory<int> outerFactory(&dummy2);
</span><del>- WeakPtr<int> weakPtr1, weakPtr2, weakPtr4;
</del><ins>+ WeakPtr<int> weakPtr1, weakPtr2, weakPtr3, weakPtr4;
</ins><span class="cx"> {
</span><span class="cx"> WeakPtrFactory<int> innerFactory(&dummy);
</span><span class="cx"> weakPtr1 = innerFactory.createWeakPtr();
</span><span class="cx"> weakPtr2 = innerFactory.createWeakPtr();
</span><ins>+ weakPtr3 = innerFactory.createWeakPtr();
</ins><span class="cx"> EXPECT_EQ(weakPtr1.get(), &dummy);
</span><span class="cx"> EXPECT_EQ(weakPtr2.get(), &dummy);
</span><del>- weakPtr1.forget();
</del><ins>+ EXPECT_EQ(weakPtr3.get(), &dummy);
+ weakPtr1.clear();
+ weakPtr3 = nullptr;
</ins><span class="cx"> EXPECT_NULL(weakPtr1.get());
</span><span class="cx"> EXPECT_EQ(weakPtr2.get(), &dummy);
</span><del>- weakPtr1.forget();
</del><ins>+ EXPECT_NULL(weakPtr3.get());
+ weakPtr1.clear();
+ weakPtr3.clear();
</ins><span class="cx"> EXPECT_NULL(weakPtr1.get());
</span><span class="cx"> EXPECT_EQ(weakPtr2.get(), &dummy);
</span><del>- WeakPtr<int> weakPtr3 = weakPtr2;
</del><ins>+ EXPECT_NULL(weakPtr3.get());
+ weakPtr3 = nullptr;
+ EXPECT_NULL(weakPtr1.get());
</ins><span class="cx"> EXPECT_EQ(weakPtr2.get(), &dummy);
</span><del>- EXPECT_EQ(weakPtr3.get(), &dummy);
- weakPtr3.forget();
</del><span class="cx"> EXPECT_NULL(weakPtr3.get());
</span><del>- EXPECT_EQ(weakPtr2.get(), &dummy);
</del><ins>+
</ins><span class="cx"> weakPtr4 = weakPtr2;
</span><span class="cx"> EXPECT_EQ(weakPtr2.get(), &dummy);
</span><span class="cx"> EXPECT_EQ(weakPtr4.get(), &dummy);
</span><span class="cx">
</span><ins>+ WeakPtr<int> weakPtr5 = weakPtr2;
+ EXPECT_EQ(weakPtr2.get(), &dummy);
+ EXPECT_EQ(weakPtr5.get(), &dummy);
+ weakPtr5.clear();
+ EXPECT_NULL(weakPtr5.get());
+ EXPECT_EQ(weakPtr2.get(), &dummy);
+
</ins><span class="cx"> weakPtr4 = outerFactory.createWeakPtr();
</span><span class="cx"> EXPECT_EQ(weakPtr2.get(), &dummy);
</span><span class="cx"> EXPECT_EQ(weakPtr4.get(), &dummy2);
</span><span class="lines">@@ -160,11 +172,19 @@
</span><span class="cx"> WeakPtr<int> weakPtr5 = weakPtr4;
</span><span class="cx"> EXPECT_EQ(weakPtr4.get(), &dummy2);
</span><span class="cx"> EXPECT_EQ(weakPtr5.get(), &dummy2);
</span><del>- weakPtr5.forget();
</del><ins>+ weakPtr5.clear();
</ins><span class="cx"> EXPECT_NULL(weakPtr5.get());
</span><span class="cx"> WeakPtr<int> weakPtr6 = weakPtr5;
</span><span class="cx"> EXPECT_NULL(weakPtr6.get());
</span><span class="cx"> EXPECT_EQ(weakPtr5.get(), weakPtr6.get());
</span><ins>+
+ WeakPtr<int> weakPtr7 = outerFactory.createWeakPtr();
+ EXPECT_EQ(weakPtr7.get(), &dummy2);
+ weakPtr7 = nullptr;
+ EXPECT_NULL(weakPtr7.get());
+
+ int doNotCopyMe = 152;
+ weakPtr7 = &doNotCopyMe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>