<!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>[243965] 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/243965">243965</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2019-04-06 20:55:59 -0700 (Sat, 06 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Added tests for WeakHashSet::computesEmpty and WeakHashSet::computeSize
https://bugs.webkit.org/show_bug.cgi?id=196669

Reviewed by Geoffrey Garen.

Source/WTF:

Removed the superflous type names from forward declarations, and made WeakHashSet::add
take a const object to match other container types in WTF.

* wtf/WeakHashSet.h:
(WTF::WeakHashSet::add):
* wtf/WeakPtr.h:

Tools:

Added three new unit tests for WeakHashSet.

* TestWebKitAPI/Tests/WTF/WeakPtr.cpp:
(WTF_WeakPtr.WeakHashSetConstObjects):
(WTF_WeakPtr.WeakHashSetComputesEmpty):
(WTF_WeakPtr.WeakHashSetComputeSize):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfWeakHashSeth">trunk/Source/WTF/wtf/WeakHashSet.h</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 (243964 => 243965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2019-04-07 02:54:58 UTC (rev 243964)
+++ trunk/Source/WTF/ChangeLog  2019-04-07 03:55:59 UTC (rev 243965)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2019-04-06  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Added tests for WeakHashSet::computesEmpty and WeakHashSet::computeSize
+        https://bugs.webkit.org/show_bug.cgi?id=196669
+
+        Reviewed by Geoffrey Garen.
+
+        Removed the superflous type names from forward declarations, and made WeakHashSet::add
+        take a const object to match other container types in WTF.
+
+        * wtf/WeakHashSet.h:
+        (WTF::WeakHashSet::add):
+        * wtf/WeakPtr.h:
+
</ins><span class="cx"> 2019-04-05  Ryosuke Niwa  <rniwa@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Make WeakPtr<Element> possible and deploy it in form associated elements code
</span></span></pre></div>
<a id="trunkSourceWTFwtfWeakHashSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WeakHashSet.h (243964 => 243965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WeakHashSet.h       2019-04-07 02:54:58 UTC (rev 243964)
+++ trunk/Source/WTF/wtf/WeakHashSet.h  2019-04-07 03:55:59 UTC (rev 243965)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">     private:
</span><del>-        template <typename U> friend class WeakHashSet;
</del><ins>+        template <typename> friend class WeakHashSet;
</ins><span class="cx"> 
</span><span class="cx">         typename WeakReferenceSet::const_iterator m_position;
</span><span class="cx">         typename WeakReferenceSet::const_iterator m_endPosition;
</span><span class="lines">@@ -86,9 +86,10 @@
</span><span class="cx">     const_iterator begin() const { return WeakHashSetConstIterator(m_set, m_set.begin()); }
</span><span class="cx">     const_iterator end() const { return WeakHashSetConstIterator(m_set, m_set.end()); }
</span><span class="cx"> 
</span><del>-    void add(T& value)
</del><ins>+    template <typename U>
+    void add(const U& value)
</ins><span class="cx">     {
</span><del>-        m_set.add(*makeWeakPtr(value).m_ref);
</del><ins>+        m_set.add(*makeWeakPtr<T>(const_cast<U&>(value)).m_ref);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     template <typename U>
</span></span></pre></div>
<a id="trunkSourceWTFwtfWeakPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WeakPtr.h (243964 => 243965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WeakPtr.h   2019-04-07 02:54:58 UTC (rev 243964)
+++ trunk/Source/WTF/wtf/WeakPtr.h      2019-04-07 03:55:59 UTC (rev 243965)
</span><span class="lines">@@ -33,9 +33,9 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WTF {
</span><span class="cx"> 
</span><del>-template<typename U> class WeakHashSet;
-template<typename T> class WeakPtr;
-template<typename T> class WeakPtrFactory;
</del><ins>+template<typename> class WeakHashSet;
+template<typename> class WeakPtr;
+template<typename> class WeakPtrFactory;
</ins><span class="cx"> 
</span><span class="cx"> // Note: WeakReference is an implementation detail, and should not be used directly.
</span><span class="cx"> template<typename T>
</span><span class="lines">@@ -86,8 +86,8 @@
</span><span class="cx">     void clear() { m_ref = nullptr; }
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    template<typename U> friend class WeakHashSet;
-    template<typename U> friend class WeakPtr;
</del><ins>+    template<typename> friend class WeakHashSet;
+    template<typename> friend class WeakPtr;
</ins><span class="cx">     template<typename U> friend WeakPtr<U> makeWeakPtr(U&);
</span><span class="cx"> 
</span><span class="cx">     RefPtr<WeakReference<T>> m_ref;
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    template<typename U> friend class WeakHashSet;
</del><ins>+    template<typename> friend class WeakHashSet;
</ins><span class="cx"> 
</span><span class="cx">     mutable RefPtr<WeakReference<T>> m_ref;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (243964 => 243965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-04-07 02:54:58 UTC (rev 243964)
+++ trunk/Tools/ChangeLog       2019-04-07 03:55:59 UTC (rev 243965)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2019-04-06  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Added tests for WeakHashSet::computesEmpty and WeakHashSet::computeSize
+        https://bugs.webkit.org/show_bug.cgi?id=196669
+
+        Reviewed by Geoffrey Garen.
+
+        Added three new unit tests for WeakHashSet.
+
+        * TestWebKitAPI/Tests/WTF/WeakPtr.cpp:
+        (WTF_WeakPtr.WeakHashSetConstObjects):
+        (WTF_WeakPtr.WeakHashSetComputesEmpty):
+        (WTF_WeakPtr.WeakHashSetComputeSize):
+
</ins><span class="cx"> 2019-04-06  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Hide next and previous form control buttons when WKWebView is editable
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFWeakPtrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/WeakPtr.cpp (243964 => 243965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/WeakPtr.cpp  2019-04-07 02:54:58 UTC (rev 243964)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/WeakPtr.cpp     2019-04-07 03:55:59 UTC (rev 243965)
</span><span class="lines">@@ -492,6 +492,72 @@
</span><span class="cx">     EXPECT_EQ(s_baseWeakReferences, 0u);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+TEST(WTF_WeakPtr, WeakHashSetConstObjects)
+{
+    {
+        WeakHashSet<Base> weakHashSet;
+        const Base object;
+        EXPECT_FALSE(weakHashSet.contains(object));
+        EXPECT_EQ(s_baseWeakReferences, 0u);
+        EXPECT_EQ(computeSizeOfWeakHashSet(weakHashSet), 0u);
+        weakHashSet.add(object);
+        EXPECT_EQ(s_baseWeakReferences, 1u);
+        EXPECT_EQ(computeSizeOfWeakHashSet(weakHashSet), 1u);
+        EXPECT_TRUE(weakHashSet.contains(object));
+        weakHashSet.checkConsistency();
+        weakHashSet.add(object);
+        EXPECT_TRUE(weakHashSet.contains(object));
+        EXPECT_EQ(s_baseWeakReferences, 1u);
+        EXPECT_EQ(computeSizeOfWeakHashSet(weakHashSet), 1u);
+        weakHashSet.checkConsistency();
+        weakHashSet.remove(object);
+        EXPECT_EQ(s_baseWeakReferences, 1u);
+        EXPECT_EQ(computeSizeOfWeakHashSet(weakHashSet), 0u);
+    }
+
+    {
+        WeakHashSet<Base> weakHashSet;
+        const Derived object;
+        EXPECT_FALSE(weakHashSet.contains(object));
+        EXPECT_EQ(s_baseWeakReferences, 0u);
+        EXPECT_EQ(computeSizeOfWeakHashSet(weakHashSet), 0u);
+        weakHashSet.add(object);
+        EXPECT_EQ(s_baseWeakReferences, 1u);
+        EXPECT_EQ(computeSizeOfWeakHashSet(weakHashSet), 1u);
+        EXPECT_TRUE(weakHashSet.contains(object));
+        weakHashSet.checkConsistency();
+        weakHashSet.add(object);
+        EXPECT_TRUE(weakHashSet.contains(object));
+        EXPECT_EQ(s_baseWeakReferences, 1u);
+        EXPECT_EQ(computeSizeOfWeakHashSet(weakHashSet), 1u);
+        weakHashSet.checkConsistency();
+        weakHashSet.remove(object);
+        EXPECT_EQ(s_baseWeakReferences, 1u);
+        EXPECT_EQ(computeSizeOfWeakHashSet(weakHashSet), 0u);
+    }
+
+    {
+        WeakHashSet<Derived> weakHashSet;
+        const Derived object;
+        EXPECT_FALSE(weakHashSet.contains(object));
+        EXPECT_EQ(s_baseWeakReferences, 0u);
+        EXPECT_EQ(computeSizeOfWeakHashSet(weakHashSet), 0u);
+        weakHashSet.add(object);
+        EXPECT_EQ(s_baseWeakReferences, 1u);
+        EXPECT_EQ(computeSizeOfWeakHashSet(weakHashSet), 1u);
+        EXPECT_TRUE(weakHashSet.contains(object));
+        weakHashSet.checkConsistency();
+        weakHashSet.add(object);
+        EXPECT_TRUE(weakHashSet.contains(object));
+        EXPECT_EQ(s_baseWeakReferences, 1u);
+        EXPECT_EQ(computeSizeOfWeakHashSet(weakHashSet), 1u);
+        weakHashSet.checkConsistency();
+        weakHashSet.remove(object);
+        EXPECT_EQ(s_baseWeakReferences, 1u);
+        EXPECT_EQ(computeSizeOfWeakHashSet(weakHashSet), 0u);
+    }
+}
+
</ins><span class="cx"> TEST(WTF_WeakPtr, WeakHashSetExpansion)
</span><span class="cx"> {
</span><span class="cx">     unsigned initialCapacity;
</span><span class="lines">@@ -569,4 +635,154 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+TEST(WTF_WeakPtr, WeakHashSetComputesEmpty)
+{
+    {
+        WeakHashSet<Base> weakHashSet;
+        {
+            Base object;
+            EXPECT_EQ(s_baseWeakReferences, 0u);
+            weakHashSet.add(object);
+            EXPECT_FALSE(weakHashSet.computesEmpty());
+        }
+        EXPECT_EQ(s_baseWeakReferences, 1u);
+        EXPECT_TRUE(weakHashSet.computesEmpty());
+    }
+
+    {
+        WeakHashSet<Base> weakHashSet;
+        Base object1;
+        EXPECT_EQ(s_baseWeakReferences, 0u);
+        weakHashSet.add(object1);
+        EXPECT_EQ(s_baseWeakReferences, 1u);
+        {
+            Base object2;
+            weakHashSet.add(object2);
+            EXPECT_FALSE(weakHashSet.computesEmpty());
+        }
+        EXPECT_EQ(s_baseWeakReferences, 2u);
+        EXPECT_FALSE(weakHashSet.computesEmpty());
+        weakHashSet.remove(object1);
+        EXPECT_TRUE(weakHashSet.computesEmpty());
+    }
+
+    {
+        WeakHashSet<Base> weakHashSet;
+        Vector<std::unique_ptr<Base>> objects;
+        auto firstObject = std::make_unique<Base>();
+        weakHashSet.add(*firstObject);
+        do {
+            auto object = std::make_unique<Base>();
+            weakHashSet.add(*object);
+            objects.append(WTFMove(object));
+        } while (weakHashSet.begin().get() == firstObject.get());
+
+        EXPECT_EQ(s_baseWeakReferences, objects.size() + 1);
+        EXPECT_EQ(computeSizeOfWeakHashSet(weakHashSet), objects.size() + 1);
+        EXPECT_FALSE(weakHashSet.computesEmpty());
+        firstObject = nullptr;
+        EXPECT_FALSE(weakHashSet.computesEmpty());
+        EXPECT_EQ(s_baseWeakReferences, objects.size() + 1);
+        EXPECT_EQ(computeSizeOfWeakHashSet(weakHashSet), objects.size());
+    }
+}
+
+TEST(WTF_WeakPtr, WeakHashSetComputeSize)
+{
+    {
+        WeakHashSet<Base> weakHashSet;
+        {
+            Base object;
+            EXPECT_EQ(s_baseWeakReferences, 0u);
+            weakHashSet.add(object);
+            EXPECT_EQ(s_baseWeakReferences, 1u);
+            EXPECT_EQ(weakHashSet.computeSize(), 1u);
+            weakHashSet.checkConsistency();
+        }
+        EXPECT_TRUE(weakHashSet.computesEmpty());
+        EXPECT_EQ(weakHashSet.computeSize(), 0u);
+        EXPECT_EQ(s_baseWeakReferences, 0u);
+        EXPECT_TRUE(weakHashSet.computesEmpty());
+        weakHashSet.checkConsistency();
+    }
+
+    {
+        WeakHashSet<Base> weakHashSet;
+        {
+            Base object1;
+            EXPECT_EQ(s_baseWeakReferences, 0u);
+            weakHashSet.add(object1);
+            EXPECT_EQ(s_baseWeakReferences, 1u);
+            {
+                Base object2;
+                weakHashSet.add(object2);
+                EXPECT_EQ(s_baseWeakReferences, 2u);
+                EXPECT_EQ(weakHashSet.computeSize(), 2u);
+                weakHashSet.checkConsistency();
+            }
+            EXPECT_EQ(s_baseWeakReferences, 2u);
+            EXPECT_EQ(weakHashSet.computeSize(), 1u);
+            EXPECT_EQ(s_baseWeakReferences, 1u);
+            weakHashSet.checkConsistency();
+            weakHashSet.remove(object1);
+            EXPECT_EQ(s_baseWeakReferences, 1u);
+            EXPECT_EQ(weakHashSet.computeSize(), 0u);
+            EXPECT_EQ(s_baseWeakReferences, 1u);
+            weakHashSet.checkConsistency();
+        }
+        EXPECT_EQ(s_baseWeakReferences, 0u);
+        weakHashSet.checkConsistency();
+    }
+
+    while (1) {
+        WeakHashSet<Base> weakHashSet;
+        auto firstObject = std::make_unique<Base>();
+        auto lastObject = std::make_unique<Base>();
+        weakHashSet.add(*firstObject);
+        weakHashSet.add(*lastObject);
+        if (weakHashSet.begin().get() != firstObject.get())
+            continue;
+        EXPECT_EQ(s_baseWeakReferences, 2u);
+        EXPECT_EQ(weakHashSet.computeSize(), 2u);
+        EXPECT_EQ(s_baseWeakReferences, 2u);
+        weakHashSet.checkConsistency();
+        firstObject = nullptr;
+        EXPECT_EQ(weakHashSet.computeSize(), 1u);
+        EXPECT_EQ(s_baseWeakReferences, 1u);
+        weakHashSet.checkConsistency();
+        lastObject = nullptr;
+        EXPECT_EQ(s_baseWeakReferences, 1u);
+        EXPECT_EQ(weakHashSet.computeSize(), 0u);
+        EXPECT_EQ(s_baseWeakReferences, 0u);
+        weakHashSet.checkConsistency();
+        break;
+    }
+
+    {
+        WeakHashSet<Base> weakHashSet;
+        Vector<std::unique_ptr<Base>> objects;
+        auto nonFirstObject = std::make_unique<Base>();
+        weakHashSet.add(*nonFirstObject);
+        do {
+            auto object = std::make_unique<Base>();
+            weakHashSet.add(*object);
+            objects.append(WTFMove(object));
+        } while (weakHashSet.begin().get() == nonFirstObject.get());
+
+        unsigned objectsCount = objects.size();
+        EXPECT_EQ(s_baseWeakReferences, objectsCount + 1);
+        EXPECT_EQ(weakHashSet.computeSize(), objectsCount + 1);
+        EXPECT_EQ(s_baseWeakReferences, objectsCount + 1);
+        weakHashSet.checkConsistency();
+        nonFirstObject = nullptr;
+        EXPECT_EQ(weakHashSet.computeSize(), objectsCount);
+        EXPECT_EQ(s_baseWeakReferences, objectsCount);
+        weakHashSet.checkConsistency();
+        objects.clear();
+        EXPECT_EQ(s_baseWeakReferences, objectsCount);
+        EXPECT_EQ(weakHashSet.computeSize(), 0u);
+        EXPECT_EQ(s_baseWeakReferences, 0u);
+    }
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>

</body>
</html>