<!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>[203325] 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/203325">203325</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-07-16 09:33:11 -0700 (Sat, 16 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add move constructor / assignment operator to ListHashSet
https://bugs.webkit.org/show_bug.cgi?id=159837
Reviewed by Darin Adler.
Source/WTF:
Add move constructor / assignment operator to ListHashSet.
* wtf/ListHashSet.h:
(WTF::ListHashSetConstIterator::operator++):
(WTF::U>::ListHashSet):
(WTF::=):
(WTF::U>::clear):
(WTF::U>::appendNode):
(WTF::U>::prependNode):
(WTF::U>::deleteAllNodes):
(WTF::ListHashSetNode::ListHashSetNode): Deleted.
Tools:
Add API tests.
* TestWebKitAPI/Tests/WTF/ListHashSet.cpp:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfListHashSeth">trunk/Source/WTF/wtf/ListHashSet.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFListHashSetcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (203324 => 203325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-07-16 15:21:55 UTC (rev 203324)
+++ trunk/Source/WTF/ChangeLog 2016-07-16 16:33:11 UTC (rev 203325)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-07-16 Chris Dumez <cdumez@apple.com>
+
+ Add move constructor / assignment operator to ListHashSet
+ https://bugs.webkit.org/show_bug.cgi?id=159837
+
+ Reviewed by Darin Adler.
+
+ Add move constructor / assignment operator to ListHashSet.
+
+ * wtf/ListHashSet.h:
+ (WTF::ListHashSetConstIterator::operator++):
+ (WTF::U>::ListHashSet):
+ (WTF::=):
+ (WTF::U>::clear):
+ (WTF::U>::appendNode):
+ (WTF::U>::prependNode):
+ (WTF::U>::deleteAllNodes):
+ (WTF::ListHashSetNode::ListHashSetNode): Deleted.
+
</ins><span class="cx"> 2016-07-15 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Use emptyString() / nullAtom when possible
</span></span></pre></div>
<a id="trunkSourceWTFwtfListHashSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ListHashSet.h (203324 => 203325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ListHashSet.h 2016-07-16 15:21:55 UTC (rev 203324)
+++ trunk/Source/WTF/wtf/ListHashSet.h 2016-07-16 16:33:11 UTC (rev 203325)
</span><span class="lines">@@ -19,8 +19,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WTF_ListHashSet_h
-#define WTF_ListHashSet_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx">
</span><span class="lines">@@ -69,9 +68,11 @@
</span><span class="cx">
</span><span class="cx"> typedef HashTableAddResult<iterator> AddResult;
</span><span class="cx">
</span><del>- ListHashSet();
</del><ins>+ ListHashSet() = default;
</ins><span class="cx"> ListHashSet(const ListHashSet&);
</span><ins>+ ListHashSet(ListHashSet&&);
</ins><span class="cx"> ListHashSet& operator=(const ListHashSet&);
</span><ins>+ ListHashSet& operator=(ListHashSet&&);
</ins><span class="cx"> ~ListHashSet();
</span><span class="cx">
</span><span class="cx"> void swap(ListHashSet&);
</span><span class="lines">@@ -149,8 +150,8 @@
</span><span class="cx"> const_iterator makeConstIterator(Node*) const;
</span><span class="cx">
</span><span class="cx"> HashTable<Node*, Node*, IdentityExtractor, NodeHash, NodeTraits, NodeTraits> m_impl;
</span><del>- Node* m_head;
- Node* m_tail;
</del><ins>+ Node* m_head { nullptr };
+ Node* m_tail { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename ValueArg> struct ListHashSetNode {
</span><span class="lines">@@ -159,14 +160,12 @@
</span><span class="cx"> template<typename T>
</span><span class="cx"> ListHashSetNode(T&& value)
</span><span class="cx"> : m_value(std::forward<T>(value))
</span><del>- , m_prev(0)
- , m_next(0)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ValueArg m_value;
</span><del>- ListHashSetNode* m_prev;
- ListHashSetNode* m_next;
</del><ins>+ ListHashSetNode* m_prev { nullptr };
+ ListHashSetNode* m_next { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename HashArg> struct ListHashSetNodeHashFunctions {
</span><span class="lines">@@ -260,7 +259,7 @@
</span><span class="cx">
</span><span class="cx"> const_iterator& operator++()
</span><span class="cx"> {
</span><del>- ASSERT(m_position != 0);
</del><ins>+ ASSERT(m_position);
</ins><span class="cx"> m_position = m_position->m_next;
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="lines">@@ -307,16 +306,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U>
</span><del>-inline ListHashSet<T, U>::ListHashSet()
- : m_head(0)
- , m_tail(0)
-{
-}
-
-template<typename T, typename U>
</del><span class="cx"> inline ListHashSet<T, U>::ListHashSet(const ListHashSet& other)
</span><del>- : m_head(0)
- , m_tail(0)
</del><span class="cx"> {
</span><span class="cx"> for (auto it = other.begin(), end = other.end(); it != end; ++it)
</span><span class="cx"> add(*it);
</span><span class="lines">@@ -331,6 +321,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U>
</span><ins>+inline ListHashSet<T, U>::ListHashSet(ListHashSet&& other)
+ : m_impl(WTFMove(other.m_impl))
+ , m_head(std::exchange(other.m_head, nullptr))
+ , m_tail(std::exchange(other.m_tail, nullptr))
+{
+}
+
+template<typename T, typename U>
+inline ListHashSet<T, U>& ListHashSet<T, U>::operator=(ListHashSet&& other)
+{
+ m_impl = WTFMove(other.m_impl);
+ m_head = std::exchange(other.m_head, nullptr);
+ m_tail = std::exchange(other.m_tail, nullptr);
+ return *this;
+}
+
+template<typename T, typename U>
</ins><span class="cx"> inline void ListHashSet<T, U>::swap(ListHashSet& other)
</span><span class="cx"> {
</span><span class="cx"> m_impl.swap(other.m_impl);
</span><span class="lines">@@ -602,8 +609,8 @@
</span><span class="cx"> {
</span><span class="cx"> deleteAllNodes();
</span><span class="cx"> m_impl.clear();
</span><del>- m_head = 0;
- m_tail = 0;
</del><ins>+ m_head = nullptr;
+ m_tail = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U>
</span><span class="lines">@@ -637,7 +644,7 @@
</span><span class="cx"> void ListHashSet<T, U>::appendNode(Node* node)
</span><span class="cx"> {
</span><span class="cx"> node->m_prev = m_tail;
</span><del>- node->m_next = 0;
</del><ins>+ node->m_next = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (m_tail) {
</span><span class="cx"> ASSERT(m_head);
</span><span class="lines">@@ -653,7 +660,7 @@
</span><span class="cx"> template<typename T, typename U>
</span><span class="cx"> void ListHashSet<T, U>::prependNode(Node* node)
</span><span class="cx"> {
</span><del>- node->m_prev = 0;
</del><ins>+ node->m_prev = nullptr;
</ins><span class="cx"> node->m_next = m_head;
</span><span class="cx">
</span><span class="cx"> if (m_head)
</span><span class="lines">@@ -686,7 +693,7 @@
</span><span class="cx"> if (!m_head)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- for (Node* node = m_head, *next = m_head->m_next; node; node = next, next = node ? node->m_next : 0)
</del><ins>+ for (Node* node = m_head, *next = m_head->m_next; node; node = next, next = node ? node->m_next : nullptr)
</ins><span class="cx"> delete node;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -705,5 +712,3 @@
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> using WTF::ListHashSet;
</span><del>-
-#endif /* WTF_ListHashSet_h */
</del></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (203324 => 203325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-07-16 15:21:55 UTC (rev 203324)
+++ trunk/Tools/ChangeLog 2016-07-16 16:33:11 UTC (rev 203325)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-07-16 Chris Dumez <cdumez@apple.com>
+
+ Add move constructor / assignment operator to ListHashSet
+ https://bugs.webkit.org/show_bug.cgi?id=159837
+
+ Reviewed by Darin Adler.
+
+ Add API tests.
+
+ * TestWebKitAPI/Tests/WTF/ListHashSet.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2016-07-15 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Change some parameters based on a random search
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFListHashSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp (203324 => 203325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp 2016-07-16 15:21:55 UTC (rev 203324)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp 2016-07-16 16:33:11 UTC (rev 203325)
</span><span class="lines">@@ -266,4 +266,86 @@
</span><span class="cx"> ASSERT_TRUE(list.isEmpty());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(WTF_ListHashSet, MoveConstructor)
+{
+ ListHashSet<int> list;
+ list.add(1);
+ list.add(2);
+ list.add(3);
+
+ ASSERT_EQ(3U, list.size());
+ auto iterator = list.begin();
+ ASSERT_EQ(1, *iterator);
+ ++iterator;
+ ASSERT_EQ(2, *iterator);
+ ++iterator;
+ ASSERT_EQ(3, *iterator);
+ ++iterator;
+
+ ListHashSet<int> list2(WTFMove(list));
+ ASSERT_EQ(3U, list2.size());
+ auto iterator2 = list2.begin();
+ ASSERT_EQ(1, *iterator2);
+ ++iterator2;
+ ASSERT_EQ(2, *iterator2);
+ ++iterator2;
+ ASSERT_EQ(3, *iterator2);
+ ++iterator2;
+
+ ASSERT_EQ(0U, list.size());
+ ASSERT_TRUE(list.begin() == list.end());
+ list.add(4);
+ list.add(5);
+ list.add(6);
+ iterator = list.begin();
+ ASSERT_EQ(4, *iterator);
+ ++iterator;
+ ASSERT_EQ(5, *iterator);
+ ++iterator;
+ ASSERT_EQ(6, *iterator);
+ ++iterator;
+}
+
+TEST(WTF_ListHashSet, MoveAssignment)
+{
+ ListHashSet<int> list;
+ list.add(1);
+ list.add(2);
+ list.add(3);
+
+ ASSERT_EQ(3U, list.size());
+ auto iterator = list.begin();
+ ASSERT_EQ(1, *iterator);
+ ++iterator;
+ ASSERT_EQ(2, *iterator);
+ ++iterator;
+ ASSERT_EQ(3, *iterator);
+ ++iterator;
+
+ ListHashSet<int> list2;
+ list2.add(10);
+ list2 = (WTFMove(list));
+ ASSERT_EQ(3U, list2.size());
+ auto iterator2 = list2.begin();
+ ASSERT_EQ(1, *iterator2);
+ ++iterator2;
+ ASSERT_EQ(2, *iterator2);
+ ++iterator2;
+ ASSERT_EQ(3, *iterator2);
+ ++iterator2;
+
+ ASSERT_EQ(0U, list.size());
+ ASSERT_TRUE(list.begin() == list.end());
+ list.add(4);
+ list.add(5);
+ list.add(6);
+ iterator = list.begin();
+ ASSERT_EQ(4, *iterator);
+ ++iterator;
+ ASSERT_EQ(5, *iterator);
+ ++iterator;
+ ASSERT_EQ(6, *iterator);
+ ++iterator;
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>