<!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>[202111] 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/202111">202111</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-15 15:07:57 -0700 (Wed, 15 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve HashMap and HashSet support for Ref
https://bugs.webkit.org/show_bug.cgi?id=158789
Patch by Sam Weinig <sam@webkit.org> on 2016-06-15
Reviewed by Chris Dumez.
Source/WTF:
Tests: Add more cases to WTF_HashMap.Ref_Key, WTF_HashMap.Ref_Value and WTF_HashSet.Ref
* wtf/HashMap.h:
* wtf/HashSet.h:
Add a MappedTakeType typedef and rework the take functions to use it and HashTraits::take(...).
* wtf/HashTraits.h:
(WTF::GenericHashTraits::assignToEmpty):
Move to GenericHashTraits rather than GenericHashTraitsBase, since it is not different
between integral and non-integral HashTraits.
(WTF::GenericHashTraits::take):
Add a trait function for take that defaults as a forward. This allows us to override take
just like we do with get/peek.
(WTF::HashTraits<Ref<P>>::emptyValue):
Remove unnecessary explicit construction.
(WTF::HashTraits<Ref<P>>::peek):
Fix assertion that could happen if you did a HashMap.get() on an empty Ref value.
(WTF::HashTraits<Ref<P>>::take):
Make the TakeType of a Ref<P> be Optional<Ref<P>>, to avoid having empty
Refs returned from HashMap and HashSet. Implement an explicit take() function to
construct one.
(WTF::HashTraits<Ref<P>>::customDeleteBucket): Deleted.
Remove unnecessary customDeleteBucket implementation. Ref does not assign nullptr to
it's m_ptr in destruction, so there is no dead store to avoid here.
* wtf/Ref.h:
(WTF::Ref::ptrAllowingHashTableEmptyValue):
Add HashTrait helper to allow getting the value of m_ptr even when it is null. This
allows us to avoid a branch in HashTraits<Ref<P>>::peek().
Tools:
* TestWebKitAPI/Tests/WTF/HashMap.cpp:
* TestWebKitAPI/Tests/WTF/HashSet.cpp:
Add more cases to WTF_HashMap.Ref_Key, WTF_HashMap.Ref_Value and WTF_HashSet.Ref</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfHashMaph">trunk/Source/WTF/wtf/HashMap.h</a></li>
<li><a href="#trunkSourceWTFwtfHashSeth">trunk/Source/WTF/wtf/HashSet.h</a></li>
<li><a href="#trunkSourceWTFwtfHashTraitsh">trunk/Source/WTF/wtf/HashTraits.h</a></li>
<li><a href="#trunkSourceWTFwtfRefh">trunk/Source/WTF/wtf/Ref.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFHashMapcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFHashSetcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (202110 => 202111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-06-15 21:56:16 UTC (rev 202110)
+++ trunk/Source/WTF/ChangeLog 2016-06-15 22:07:57 UTC (rev 202111)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2016-06-15 Sam Weinig <sam@webkit.org>
+
+ Improve HashMap and HashSet support for Ref
+ https://bugs.webkit.org/show_bug.cgi?id=158789
+
+ Reviewed by Chris Dumez.
+
+ Tests: Add more cases to WTF_HashMap.Ref_Key, WTF_HashMap.Ref_Value and WTF_HashSet.Ref
+
+ * wtf/HashMap.h:
+ * wtf/HashSet.h:
+ Add a MappedTakeType typedef and rework the take functions to use it and HashTraits::take(...).
+
+ * wtf/HashTraits.h:
+ (WTF::GenericHashTraits::assignToEmpty):
+ Move to GenericHashTraits rather than GenericHashTraitsBase, since it is not different
+ between integral and non-integral HashTraits.
+
+ (WTF::GenericHashTraits::take):
+ Add a trait function for take that defaults as a forward. This allows us to override take
+ just like we do with get/peek.
+
+ (WTF::HashTraits<Ref<P>>::emptyValue):
+ Remove unnecessary explicit construction.
+
+ (WTF::HashTraits<Ref<P>>::peek):
+ Fix assertion that could happen if you did a HashMap.get() on an empty Ref value.
+
+ (WTF::HashTraits<Ref<P>>::take):
+ Make the TakeType of a Ref<P> be Optional<Ref<P>>, to avoid having empty
+ Refs returned from HashMap and HashSet. Implement an explicit take() function to
+ construct one.
+
+ (WTF::HashTraits<Ref<P>>::customDeleteBucket): Deleted.
+ Remove unnecessary customDeleteBucket implementation. Ref does not assign nullptr to
+ it's m_ptr in destruction, so there is no dead store to avoid here.
+
+ * wtf/Ref.h:
+ (WTF::Ref::ptrAllowingHashTableEmptyValue):
+ Add HashTrait helper to allow getting the value of m_ptr even when it is null. This
+ allows us to avoid a branch in HashTraits<Ref<P>>::peek().
+
</ins><span class="cx"> 2016-06-15 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> Only Mac port needs ObjC API for JSC
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashMap.h (202110 => 202111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashMap.h 2016-06-15 21:56:16 UTC (rev 202110)
+++ trunk/Source/WTF/wtf/HashMap.h 2016-06-15 22:07:57 UTC (rev 202111)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> typedef typename MappedTraits::PeekType MappedPeekType;
</span><ins>+ typedef typename MappedTraits::TakeType MappedTakeType;
</ins><span class="cx">
</span><span class="cx"> typedef HashArg HashFunctions;
</span><span class="cx">
</span><span class="lines">@@ -130,7 +131,7 @@
</span><span class="cx"> void removeIf(const Functor& functor);
</span><span class="cx"> void clear();
</span><span class="cx">
</span><del>- MappedType take(const KeyType&); // efficient combination of get with remove
</del><ins>+ MappedTakeType take(const KeyType&); // efficient combination of get with remove
</ins><span class="cx">
</span><span class="cx"> // An alternate version of find() that finds the object by hashing and comparing
</span><span class="cx"> // with some other type, to avoid the cost of type conversion. HashTranslator
</span><span class="lines">@@ -156,7 +157,7 @@
</span><span class="cx"> template<typename K = KeyType> typename std::enable_if<IsSmartPtr<K>::value, MappedPeekType>::type inlineGet(typename GetPtrHelper<K>::PtrType) const;
</span><span class="cx"> template<typename K = KeyType> typename std::enable_if<IsSmartPtr<K>::value, MappedPeekType>::type get(typename GetPtrHelper<K>::PtrType) const;
</span><span class="cx"> template<typename K = KeyType> typename std::enable_if<IsSmartPtr<K>::value, bool>::type remove(typename GetPtrHelper<K>::PtrType);
</span><del>- template<typename K = KeyType> typename std::enable_if<IsSmartPtr<K>::value, MappedType>::type take(typename GetPtrHelper<K>::PtrType);
</del><ins>+ template<typename K = KeyType> typename std::enable_if<IsSmartPtr<K>::value, MappedTakeType>::type take(typename GetPtrHelper<K>::PtrType);
</ins><span class="cx">
</span><span class="cx"> void checkConsistency() const;
</span><span class="cx">
</span><span class="lines">@@ -434,12 +435,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U, typename V, typename W, typename MappedTraits>
</span><del>-auto HashMap<T, U, V, W, MappedTraits>::take(const KeyType& key) -> MappedType
</del><ins>+auto HashMap<T, U, V, W, MappedTraits>::take(const KeyType& key) -> MappedTakeType
</ins><span class="cx"> {
</span><span class="cx"> iterator it = find(key);
</span><span class="cx"> if (it == end())
</span><del>- return MappedTraits::emptyValue();
- MappedType value = WTFMove(it->value);
</del><ins>+ return MappedTraits::take(MappedTraits::emptyValue());
+ auto value = MappedTraits::take(WTFMove(it->value));
</ins><span class="cx"> remove(it);
</span><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="lines">@@ -491,12 +492,12 @@
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U, typename V, typename W, typename X>
</span><span class="cx"> template<typename K>
</span><del>-inline auto HashMap<T, U, V, W, X>::take(typename GetPtrHelper<K>::PtrType key) -> typename std::enable_if<IsSmartPtr<K>::value, MappedType>::type
</del><ins>+inline auto HashMap<T, U, V, W, X>::take(typename GetPtrHelper<K>::PtrType key) -> typename std::enable_if<IsSmartPtr<K>::value, MappedTakeType>::type
</ins><span class="cx"> {
</span><span class="cx"> iterator it = find(key);
</span><span class="cx"> if (it == end())
</span><del>- return MappedTraits::emptyValue();
- MappedType value = WTFMove(it->value);
</del><ins>+ return MappedTraits::take(MappedTraits::emptyValue());
+ auto value = MappedTraits::take(WTFMove(it->value));
</ins><span class="cx"> remove(it);
</span><span class="cx"> return value;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashSet.h (202110 => 202111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashSet.h 2016-06-15 21:56:16 UTC (rev 202110)
+++ trunk/Source/WTF/wtf/HashSet.h 2016-06-15 22:07:57 UTC (rev 202111)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> private:
</span><span class="cx"> typedef HashArg HashFunctions;
</span><span class="cx"> typedef TraitsArg ValueTraits;
</span><ins>+ typedef typename ValueTraits::TakeType TakeType;
</ins><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> typedef typename ValueTraits::TraitType ValueType;
</span><span class="lines">@@ -105,15 +106,15 @@
</span><span class="cx"> void removeIf(const Functor&);
</span><span class="cx"> void clear();
</span><span class="cx">
</span><del>- ValueType take(const ValueType&);
- ValueType take(iterator);
- ValueType takeAny();
</del><ins>+ TakeType take(const ValueType&);
+ TakeType take(iterator);
+ TakeType takeAny();
</ins><span class="cx">
</span><span class="cx"> // Overloads for smart pointer values that take the raw pointer type as the parameter.
</span><span class="cx"> template<typename V = ValueType> typename std::enable_if<IsSmartPtr<V>::value, iterator>::type find(typename GetPtrHelper<V>::PtrType) const;
</span><span class="cx"> template<typename V = ValueType> typename std::enable_if<IsSmartPtr<V>::value, bool>::type contains(typename GetPtrHelper<V>::PtrType) const;
</span><span class="cx"> template<typename V = ValueType> typename std::enable_if<IsSmartPtr<V>::value, bool>::type remove(typename GetPtrHelper<V>::PtrType);
</span><del>- template<typename V = ValueType> typename std::enable_if<IsSmartPtr<V>::value, ValueType>::type take(typename GetPtrHelper<V>::PtrType);
</del><ins>+ template<typename V = ValueType> typename std::enable_if<IsSmartPtr<V>::value, TakeType>::type take(typename GetPtrHelper<V>::PtrType);
</ins><span class="cx">
</span><span class="cx"> static bool isValidValue(const ValueType&);
</span><span class="cx">
</span><span class="lines">@@ -269,24 +270,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U, typename V>
</span><del>- inline auto HashSet<T, U, V>::take(iterator it) -> ValueType
</del><ins>+ inline auto HashSet<T, U, V>::take(iterator it) -> TakeType
</ins><span class="cx"> {
</span><span class="cx"> if (it == end())
</span><del>- return ValueTraits::emptyValue();
</del><ins>+ return ValueTraits::take(ValueTraits::emptyValue());
</ins><span class="cx">
</span><del>- ValueType result = WTFMove(const_cast<ValueType&>(*it));
</del><ins>+ auto result = ValueTraits::take(WTFMove(const_cast<ValueType&>(*it)));
</ins><span class="cx"> remove(it);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U, typename V>
</span><del>- inline auto HashSet<T, U, V>::take(const ValueType& value) -> ValueType
</del><ins>+ inline auto HashSet<T, U, V>::take(const ValueType& value) -> TakeType
</ins><span class="cx"> {
</span><span class="cx"> return take(find(value));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U, typename V>
</span><del>- inline auto HashSet<T, U, V>::takeAny() -> ValueType
</del><ins>+ inline auto HashSet<T, U, V>::takeAny() -> TakeType
</ins><span class="cx"> {
</span><span class="cx"> return take(begin());
</span><span class="cx"> }
</span><span class="lines">@@ -314,7 +315,7 @@
</span><span class="cx">
</span><span class="cx"> template<typename Value, typename HashFunctions, typename Traits>
</span><span class="cx"> template<typename V>
</span><del>- inline auto HashSet<Value, HashFunctions, Traits>::take(typename GetPtrHelper<V>::PtrType value) -> typename std::enable_if<IsSmartPtr<V>::value, ValueType>::type
</del><ins>+ inline auto HashSet<Value, HashFunctions, Traits>::take(typename GetPtrHelper<V>::PtrType value) -> typename std::enable_if<IsSmartPtr<V>::value, TakeType>::type
</ins><span class="cx"> {
</span><span class="cx"> return take(find(value));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashTraitsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashTraits.h (202110 => 202111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashTraits.h 2016-06-15 21:56:16 UTC (rev 202110)
+++ trunk/Source/WTF/wtf/HashTraits.h 2016-06-15 22:07:57 UTC (rev 202111)
</span><span class="lines">@@ -21,10 +21,11 @@
</span><span class="cx"> #ifndef WTF_HashTraits_h
</span><span class="cx"> #define WTF_HashTraits_h
</span><span class="cx">
</span><ins>+#include <limits>
+#include <utility>
</ins><span class="cx"> #include <wtf/HashFunctions.h>
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><del>-#include <utility>
-#include <limits>
</del><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="lines">@@ -43,12 +44,6 @@
</span><span class="cx"> // for cases like String that need them.
</span><span class="cx"> static const bool hasIsEmptyValueFunction = false;
</span><span class="cx">
</span><del>- template<typename U, typename V>
- static void assignToEmpty(U& emptyValue, V&& value)
- {
- emptyValue = std::forward<V>(value);
- }
-
</del><span class="cx"> // The starting table size. Can be overridden when we know beforehand that
</span><span class="cx"> // a hash table will have at least N entries.
</span><span class="cx"> static const unsigned minimumTableSize = 8;
</span><span class="lines">@@ -67,9 +62,18 @@
</span><span class="cx">
</span><span class="cx"> static T emptyValue() { return T(); }
</span><span class="cx">
</span><ins>+ template<typename U, typename V>
+ static void assignToEmpty(U& emptyValue, V&& value)
+ {
+ emptyValue = std::forward<V>(value);
+ }
+
</ins><span class="cx"> // Type for return value of functions that do not transfer ownership, such as get.
</span><span class="cx"> typedef T PeekType;
</span><span class="cx"> template<typename U> static U&& peek(U&& value) { return std::forward<U>(value); }
</span><ins>+
+ typedef T TakeType;
+ template<typename U> static TakeType take(U&& value) { return std::forward<U>(value); }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename T> struct HashTraits : GenericHashTraits<T> { };
</span><span class="lines">@@ -173,28 +177,19 @@
</span><span class="cx">
</span><span class="cx"> template<typename P> struct HashTraits<Ref<P>> : SimpleClassHashTraits<Ref<P>> {
</span><span class="cx"> static const bool emptyValueIsZero = true;
</span><del>- static Ref<P> emptyValue() { return Ref<P>(HashTableEmptyValue); }
</del><ins>+ static Ref<P> emptyValue() { return HashTableEmptyValue; }
</ins><span class="cx">
</span><span class="cx"> static const bool hasIsEmptyValueFunction = true;
</span><span class="cx"> static bool isEmptyValue(const Ref<P>& value) { return value.isHashTableEmptyValue(); }
</span><span class="cx">
</span><del>- static void assignToEmpty(Ref<P>& emptyValue, Ref<P>&& newValue)
- {
- ASSERT(isEmptyValue(emptyValue));
- emptyValue.assignToHashTableEmptyValue(WTFMove(newValue));
- }
</del><ins>+ static void assignToEmpty(Ref<P>& emptyValue, Ref<P>&& newValue) { ASSERT(isEmptyValue(emptyValue)); emptyValue.assignToHashTableEmptyValue(WTFMove(newValue)); }
</ins><span class="cx">
</span><span class="cx"> typedef P* PeekType;
</span><del>- static PeekType peek(const Ref<P>& value) { return const_cast<PeekType>(value.ptr()); }
</del><ins>+ static PeekType peek(const Ref<P>& value) { return const_cast<PeekType>(value.ptrAllowingHashTableEmptyValue()); }
</ins><span class="cx"> static PeekType peek(P* value) { return value; }
</span><span class="cx">
</span><del>- static void customDeleteBucket(Ref<P>& value)
- {
- // See unique_ptr's customDeleteBucket() for an explanation.
- ASSERT(!SimpleClassHashTraits<Ref<P>>::isDeletedValue(value));
- auto valueToBeDestroyed = WTFMove(value);
- SimpleClassHashTraits<Ref<P>>::constructDeletedValue(value);
- }
</del><ins>+ typedef Optional<Ref<P>> TakeType;
+ static TakeType take(Ref<P>&& value) { return isEmptyValue(value) ? Nullopt : Optional<Ref<P>>(WTFMove(value)); }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct HashTraits<String> : SimpleClassHashTraits<String> {
</span></span></pre></div>
<a id="trunkSourceWTFwtfRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Ref.h (202110 => 202111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Ref.h 2016-06-15 21:56:16 UTC (rev 202110)
+++ trunk/Source/WTF/wtf/Ref.h 2016-06-15 22:07:57 UTC (rev 202111)
</span><span class="lines">@@ -123,6 +123,9 @@
</span><span class="cx"> bool isHashTableEmptyValue() const { return m_ptr == hashTableEmptyValue(); }
</span><span class="cx"> static T* hashTableEmptyValue() { return nullptr; }
</span><span class="cx">
</span><ins>+ const T* ptrAllowingHashTableEmptyValue() const { ASSERT(m_ptr || isHashTableEmptyValue()); return m_ptr; }
+ T* ptrAllowingHashTableEmptyValue() { ASSERT(m_ptr || isHashTableEmptyValue()); return m_ptr; }
+
</ins><span class="cx"> void assignToHashTableEmptyValue(Ref&& reference)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_ptr == hashTableEmptyValue());
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (202110 => 202111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-06-15 21:56:16 UTC (rev 202110)
+++ trunk/Tools/ChangeLog 2016-06-15 22:07:57 UTC (rev 202111)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-15 Sam Weinig <sam@webkit.org>
+
+ Improve HashMap and HashSet support for Ref
+ https://bugs.webkit.org/show_bug.cgi?id=158789
+
+ Reviewed by Chris Dumez.
+
+ * TestWebKitAPI/Tests/WTF/HashMap.cpp:
+ * TestWebKitAPI/Tests/WTF/HashSet.cpp:
+ Add more cases to WTF_HashMap.Ref_Key, WTF_HashMap.Ref_Value and WTF_HashSet.Ref
+
</ins><span class="cx"> 2016-06-15 Aakash Jain <aakash_jain@apple.com>
</span><span class="cx">
</span><span class="cx"> Too much log data generated during layout-tests on iOS Simulator
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFHashMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp (202110 => 202111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp 2016-06-15 21:56:16 UTC (rev 202110)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp 2016-06-15 22:07:57 UTC (rev 202111)
</span><span class="lines">@@ -833,26 +833,43 @@
</span><span class="cx"> Ref<RefLogger> ref(a);
</span><span class="cx"> map.add(1, WTFMove(ref));
</span><span class="cx">
</span><del>- ASSERT_EQ(map.get(1), &a);
</del><ins>+ auto aGet = map.get(1);
+ ASSERT_EQ(aGet, &a);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> HashMap<int, Ref<RefLogger>> map;
</span><ins>+
+ auto emptyGet = map.get(1);
+ ASSERT_TRUE(emptyGet == nullptr);
+ }
</ins><span class="cx">
</span><ins>+ {
+ HashMap<int, Ref<RefLogger>> map;
+
</ins><span class="cx"> RefLogger a("a");
</span><span class="cx"> Ref<RefLogger> ref(a);
</span><span class="cx"> map.add(1, WTFMove(ref));
</span><span class="cx">
</span><del>- Ref<RefLogger> aOut = map.take(1);
</del><ins>+ auto aOut = map.take(1);
+ ASSERT_TRUE(static_cast<bool>(aOut));
+ ASSERT_EQ(&a, aOut.value().ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> HashMap<int, Ref<RefLogger>> map;
</span><ins>+
+ auto emptyTake = map.take(1);
+ ASSERT_FALSE(static_cast<bool>(emptyTake));
+ }
</ins><span class="cx">
</span><ins>+ {
+ HashMap<int, Ref<RefLogger>> map;
+
</ins><span class="cx"> RefLogger a("a");
</span><span class="cx"> Ref<RefLogger> ref(a);
</span><span class="cx"> map.add(1, WTFMove(ref));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFHashSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp (202110 => 202111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp 2016-06-15 21:56:16 UTC (rev 202110)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp 2016-06-15 22:07:57 UTC (rev 202111)
</span><span class="lines">@@ -388,6 +388,40 @@
</span><span class="cx"> RefLogger a("a");
</span><span class="cx"> Ref<RefLogger> ref(a);
</span><span class="cx"> set.add(WTFMove(ref));
</span><ins>+
+ auto aOut = set.take(&a);
+ ASSERT_TRUE(static_cast<bool>(aOut));
+ ASSERT_EQ(&a, aOut.value().ptr());
+ }
+
+ ASSERT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
+
+ {
+ HashSet<Ref<RefLogger>> set;
+
+ RefLogger a("a");
+ Ref<RefLogger> ref(a);
+ set.add(WTFMove(ref));
+
+ auto aOut = set.takeAny();
+ ASSERT_TRUE(static_cast<bool>(aOut));
+ ASSERT_EQ(&a, aOut.value().ptr());
+ }
+
+ ASSERT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
+
+ {
+ HashSet<Ref<RefLogger>> set;
+ auto emptyTake = set.takeAny();
+ ASSERT_FALSE(static_cast<bool>(emptyTake));
+ }
+
+ {
+ HashSet<Ref<RefLogger>> set;
+
+ RefLogger a("a");
+ Ref<RefLogger> ref(a);
+ set.add(WTFMove(ref));
</ins><span class="cx">
</span><span class="cx"> ASSERT_TRUE(set.contains(&a));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>