<!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>[173807] trunk/Source/WTF</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/173807">173807</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-22 00:20:31 -0700 (Mon, 22 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate redundant PtrHash specializations
https://bugs.webkit.org/show_bug.cgi?id=136990
Patch by Sam Weinig <sam@webkit.org> on 2014-09-22
Reviewed by Darin Adler.
Now that we have IsSmartPtr, we can eliminate all the specializations
of PtrHash that we had (for RefPtr, OwnPtr, RetainPtr, and std::unique_ptr)
and instead just have one that uses GetPtrHelper.
No changes of behavior intended.
* wtf/GetPtr.h:
Remove unnecessary const_cast that Darin noticed.
* wtf/HashFunctions.h:
(WTF::PtrHash::hash): Deleted.
(WTF::PtrHash::equal): Deleted.
(WTF::PtrHash<RefPtr<P>>::hash): Deleted.
(WTF::PtrHash<RefPtr<P>>::equal): Deleted.
Specialize PtrHash based on whether the type is a smart pointer, and use GetPtrHelper
to implement the smart pointer specialized variant.
* wtf/HashMap.h:
Remove include of GetPtr.h that is now included by HashFunctions.h
* wtf/OwnPtr.h:
(WTF::PtrHash<OwnPtr<P>>::hash): Deleted.
(WTF::PtrHash<OwnPtr<P>>::equal): Deleted.
Remove unnecessary specialization of PtrHash.
* wtf/RetainPtr.h:
(WTF::PtrHash<RetainPtr<P>>::hash): Deleted.
(WTF::PtrHash<RetainPtr<P>>::equal): Deleted.
Specialize IsSmartPointer for RetainPtr and remove the then unnecessary specialization of PtrHash.
(This is already tested in the API test WTF/cf/RetainPtrHashing).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfGetPtrh">trunk/Source/WTF/wtf/GetPtr.h</a></li>
<li><a href="#trunkSourceWTFwtfHashFunctionsh">trunk/Source/WTF/wtf/HashFunctions.h</a></li>
<li><a href="#trunkSourceWTFwtfHashMaph">trunk/Source/WTF/wtf/HashMap.h</a></li>
<li><a href="#trunkSourceWTFwtfOwnPtrh">trunk/Source/WTF/wtf/OwnPtr.h</a></li>
<li><a href="#trunkSourceWTFwtfRetainPtrh">trunk/Source/WTF/wtf/RetainPtr.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (173806 => 173807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-09-22 07:08:42 UTC (rev 173806)
+++ trunk/Source/WTF/ChangeLog 2014-09-22 07:20:31 UTC (rev 173807)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2014-09-22 Sam Weinig <sam@webkit.org>
+
+ Eliminate redundant PtrHash specializations
+ https://bugs.webkit.org/show_bug.cgi?id=136990
+
+ Reviewed by Darin Adler.
+
+ Now that we have IsSmartPtr, we can eliminate all the specializations
+ of PtrHash that we had (for RefPtr, OwnPtr, RetainPtr, and std::unique_ptr)
+ and instead just have one that uses GetPtrHelper.
+
+ No changes of behavior intended.
+
+ * wtf/GetPtr.h:
+ Remove unnecessary const_cast that Darin noticed.
+
+ * wtf/HashFunctions.h:
+ (WTF::PtrHash::hash): Deleted.
+ (WTF::PtrHash::equal): Deleted.
+ (WTF::PtrHash<RefPtr<P>>::hash): Deleted.
+ (WTF::PtrHash<RefPtr<P>>::equal): Deleted.
+ Specialize PtrHash based on whether the type is a smart pointer, and use GetPtrHelper
+ to implement the smart pointer specialized variant.
+
+ * wtf/HashMap.h:
+ Remove include of GetPtr.h that is now included by HashFunctions.h
+
+ * wtf/OwnPtr.h:
+ (WTF::PtrHash<OwnPtr<P>>::hash): Deleted.
+ (WTF::PtrHash<OwnPtr<P>>::equal): Deleted.
+ Remove unnecessary specialization of PtrHash.
+
+ * wtf/RetainPtr.h:
+ (WTF::PtrHash<RetainPtr<P>>::hash): Deleted.
+ (WTF::PtrHash<RetainPtr<P>>::equal): Deleted.
+ Specialize IsSmartPointer for RetainPtr and remove the then unnecessary specialization of PtrHash.
+ (This is already tested in the API test WTF/cf/RetainPtrHashing).
+
</ins><span class="cx"> 2014-09-20 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Make possible HashSet<std::unique_ptr<>>
</span></span></pre></div>
<a id="trunkSourceWTFwtfGetPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/GetPtr.h (173806 => 173807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/GetPtr.h 2014-09-22 07:08:42 UTC (rev 173806)
+++ trunk/Source/WTF/wtf/GetPtr.h 2014-09-22 07:20:31 UTC (rev 173807)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> template <typename T, typename Deleter>
</span><span class="cx"> struct GetPtrHelper<std::unique_ptr<T, Deleter>> {
</span><span class="cx"> typedef T* PtrType;
</span><del>- static T* getPtr(const std::unique_ptr<T, Deleter>& p) { return const_cast<T*>(p.get()); }
</del><ins>+ static T* getPtr(const std::unique_ptr<T, Deleter>& p) { return p.get(); }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashFunctions.h (173806 => 173807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashFunctions.h 2014-09-22 07:08:42 UTC (rev 173806)
+++ trunk/Source/WTF/wtf/HashFunctions.h 2014-09-22 07:20:31 UTC (rev 173807)
</span><span class="lines">@@ -21,8 +21,9 @@
</span><span class="cx"> #ifndef WTF_HashFunctions_h
</span><span class="cx"> #define WTF_HashFunctions_h
</span><span class="cx">
</span><ins>+#include <stdint.h>
+#include <wtf/GetPtr.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><del>-#include <stdint.h>
</del><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="lines">@@ -119,31 +120,33 @@
</span><span class="cx">
</span><span class="cx"> // pointer identity hash function
</span><span class="cx">
</span><del>- template<typename T> struct PtrHash {
- static unsigned hash(T key)
- {
- return IntHash<uintptr_t>::hash(reinterpret_cast<uintptr_t>(key));
- }
- static bool equal(T a, T b) { return a == b; }
</del><ins>+ template<typename T, bool isSmartPointer>
+ struct PtrHashBase;
+
+ template <typename T>
+ struct PtrHashBase<T, false /* isSmartPtr */> {
+ typedef T PtrType;
+
+ static unsigned hash(PtrType key) { return IntHash<uintptr_t>::hash(reinterpret_cast<uintptr_t>(key)); }
+ static bool equal(PtrType a, PtrType b) { return a == b; }
</ins><span class="cx"> static const bool safeToCompareToEmptyOrDeleted = true;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- template<typename P> struct PtrHash<RefPtr<P>> : PtrHash<P*> {
- using PtrHash<P*>::hash;
- static unsigned hash(const RefPtr<P>& key) { return hash(key.get()); }
- using PtrHash<P*>::equal;
- static bool equal(const RefPtr<P>& a, const RefPtr<P>& b) { return a == b; }
- static bool equal(P* a, const RefPtr<P>& b) { return a == b; }
- static bool equal(const RefPtr<P>& a, P* b) { return a == b; }
</del><ins>+ template <typename T>
+ struct PtrHashBase<T, true /* isSmartPtr */> {
+ typedef typename GetPtrHelper<T>::PtrType PtrType;
+
+ static unsigned hash(PtrType key) { return IntHash<uintptr_t>::hash(reinterpret_cast<uintptr_t>(key)); }
+ static bool equal(PtrType a, PtrType b) { return a == b; }
+ static const bool safeToCompareToEmptyOrDeleted = true;
+
+ static unsigned hash(const T& key) { return hash(getPtr(key)); }
+ static bool equal(const T& a, const T& b) { return getPtr(a) == getPtr(b); }
+ static bool equal(PtrType a, const T& b) { return a == getPtr(b); }
+ static bool equal(const T& a, PtrType b) { return getPtr(a) == b; }
</ins><span class="cx"> };
</span><span class="cx">
</span><del>- template<typename P, typename Deleter> struct PtrHash<std::unique_ptr<P, Deleter>> : PtrHash<P*> {
- using PtrHash<P*>::hash;
- static unsigned hash(const std::unique_ptr<P, Deleter>& key) { return hash(key.get()); }
- using PtrHash<P*>::equal;
- static bool equal(const std::unique_ptr<P, Deleter>& a, const std::unique_ptr<P, Deleter>& b) { return a.get() == b.get(); }
- static bool equal(P* a, const std::unique_ptr<P, Deleter>& b) { return a == b.get(); }
- static bool equal(const std::unique_ptr<P, Deleter>& a, P* b) { return a.get() == b; }
</del><ins>+ template<typename T> struct PtrHash : PtrHashBase<T, IsSmartPtr<T>::value> {
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // default hash function for each type
</span><span class="lines">@@ -159,8 +162,7 @@
</span><span class="cx"> {
</span><span class="cx"> return DefaultHash<T>::Hash::equal(a.first, b.first) && DefaultHash<U>::Hash::equal(a.second, b.second);
</span><span class="cx"> }
</span><del>- static const bool safeToCompareToEmptyOrDeleted = DefaultHash<T>::Hash::safeToCompareToEmptyOrDeleted
- && DefaultHash<U>::Hash::safeToCompareToEmptyOrDeleted;
</del><ins>+ static const bool safeToCompareToEmptyOrDeleted = DefaultHash<T>::Hash::safeToCompareToEmptyOrDeleted && DefaultHash<U>::Hash::safeToCompareToEmptyOrDeleted;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U> struct IntPairHash {
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashMap.h (173806 => 173807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashMap.h 2014-09-22 07:08:42 UTC (rev 173806)
+++ trunk/Source/WTF/wtf/HashMap.h 2014-09-22 07:20:31 UTC (rev 173807)
</span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx"> #define WTF_HashMap_h
</span><span class="cx">
</span><span class="cx"> #include <initializer_list>
</span><del>-#include <wtf/GetPtr.h>
</del><span class="cx"> #include <wtf/HashTable.h>
</span><span class="cx"> #include <wtf/IteratorRange.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfOwnPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/OwnPtr.h (173806 => 173807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/OwnPtr.h 2014-09-22 07:08:42 UTC (rev 173806)
+++ trunk/Source/WTF/wtf/OwnPtr.h 2014-09-22 07:20:31 UTC (rev 173807)
</span><span class="lines">@@ -201,10 +201,6 @@
</span><span class="cx"> return a != b.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template <typename T> struct IsSmartPtr<OwnPtr<T>> {
- static const bool value = true;
- };
-
</del><span class="cx"> template<typename T> template<typename... Args> inline void OwnPtr<T>::createTransactionally(Args... args)
</span><span class="cx"> {
</span><span class="cx"> if (m_ptr) {
</span><span class="lines">@@ -227,16 +223,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template<typename P> struct PtrHash<OwnPtr<P>> : PtrHash<P*> {
- using PtrHash<P*>::hash;
- static unsigned hash(const OwnPtr<P>& key) { return hash(key.get()); }
- using PtrHash<P*>::equal;
- static bool equal(const OwnPtr<P>& a, const OwnPtr<P>& b) { return a.get() == b.get(); }
- static bool equal(P* a, const OwnPtr<P>& b) { return a == b.get(); }
- static bool equal(const OwnPtr<P>& a, P* b) { return a.get() == b; }
</del><ins>+ template <typename T> struct IsSmartPtr<OwnPtr<T>> {
+ static const bool value = true;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>- template<typename P> struct DefaultHash<OwnPtr<P>> { typedef PtrHash<OwnPtr<P>> Hash; };
</del><ins>+ template<typename P> struct DefaultHash<OwnPtr<P>> {
+ typedef PtrHash<OwnPtr<P>> Hash;
+ };
</ins><span class="cx">
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfRetainPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RetainPtr.h (173806 => 173807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RetainPtr.h 2014-09-22 07:08:42 UTC (rev 173806)
+++ trunk/Source/WTF/wtf/RetainPtr.h 2014-09-22 07:20:31 UTC (rev 173807)
</span><span class="lines">@@ -277,18 +277,16 @@
</span><span class="cx"> return ptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template<typename P> struct HashTraits<RetainPtr<P>> : SimpleClassHashTraits<RetainPtr<P>> { };
-
- template<typename P> struct PtrHash<RetainPtr<P>> : PtrHash<typename RetainPtr<P>::PtrType> {
- using PtrHash<typename RetainPtr<P>::PtrType>::hash;
- static unsigned hash(const RetainPtr<P>& key) { return hash(key.get()); }
- using PtrHash<typename RetainPtr<P>::PtrType>::equal;
- static bool equal(const RetainPtr<P>& a, const RetainPtr<P>& b) { return a == b; }
- static bool equal(typename RetainPtr<P>::PtrType a, const RetainPtr<P>& b) { return a == b; }
- static bool equal(const RetainPtr<P>& a, typename RetainPtr<P>::PtrType b) { return a == b; }
</del><ins>+ template <typename T> struct IsSmartPtr<RetainPtr<T>> {
+ static const bool value = true;
</ins><span class="cx"> };
</span><ins>+
+ template<typename P> struct HashTraits<RetainPtr<P>> : SimpleClassHashTraits<RetainPtr<P>> {
+ };
</ins><span class="cx">
</span><del>- template<typename P> struct DefaultHash<RetainPtr<P>> { typedef PtrHash<RetainPtr<P>> Hash; };
</del><ins>+ template<typename P> struct DefaultHash<RetainPtr<P>> {
+ typedef PtrHash<RetainPtr<P>> Hash;
+ };
</ins><span class="cx">
</span><span class="cx"> template <typename P>
</span><span class="cx"> struct RetainPtrObjectHashTraits : SimpleClassHashTraits<RetainPtr<P>> {
</span></span></pre>
</div>
</div>
</body>
</html>