Enable WTF::HashSet<OwnPtr<> >

Source/wtf/HashFunctions.h

 /*
  * Copyright (C) 2005, 2006, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef WTF_HashFunctions_h
 #define WTF_HashFunctions_h
 
+#include "wtf/OwnPtr.h"
 #include "wtf/RefPtr.h"
 #include "wtf/StdLibExtras.h"
 #include <stdint.h>
 
 namespace WTF {
 
     template<size_t size> struct IntTypes;
     template<> struct IntTypes<1> { typedef int8_t SignedType; typedef uint8_t UnsignedType; };
     template<> struct IntTypes<2> { typedef int16_t SignedType; typedef uint16_t UnsignedType; };
     template<> struct IntTypes<4> { typedef int32_t SignedType; typedef uint32_t UnsignedType; };
@@ skipping 97 matching lines @@
 #if COMPILER(MSVC)
 #pragma warning(pop)
 #endif
         }
         static bool equal(T a, T b) { return a == b; }
         static const bool safeToCompareToEmptyOrDeleted = true;
     };
     template<typename P> struct PtrHash<RefPtr<P> > : PtrHash<P*> {
         using PtrHash<P*>::hash;
         static unsigned hash(const RefPtr<P>& key) { return hash(key.get()); }
+        static unsigned hash(const PassRefPtr<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; }
+        static bool equal(const RefPtr<P>& a, const PassRefPtr<P>& b) { return a == b; }
     };
     template<typename P> struct PtrHash<RawPtr<P> > : PtrHash<P*> {
         using PtrHash<P*>::hash;
         static unsigned hash(const RawPtr<P>& key) { return hash(key.get()); }
         using PtrHash<P*>::equal;
         static bool equal(const RawPtr<P>& a, const RawPtr<P>& b) { return a == b; }
         static bool equal(P* a, const RawPtr<P>& b) { return a == b; }
         static bool equal(const RawPtr<P>& a, P* b) { return a == b; }
     };
+    template<typename P> struct PtrHash<OwnPtr<P> > : PtrHash<P*> {
+        using PtrHash<P*>::hash;
+        static unsigned hash(const OwnPtr<P>& key) { return hash(key.get()); }
+        static unsigned hash(const PassOwnPtr<P>& key) { return hash(key.get()); }
+
+        static bool equal(const OwnPtr<P>& a, const OwnPtr<P>& b)
+        {
+            RELEASE_ASSERT(!a || a.get() != b.get());

[Erik Corry, 2014/04/28 07:53:03]

I understand why you have this, but I think RELEASE_ASSERT is too heavy for
something that gets called multiple times for each add or lookup in the set.  I
don't think there's a very good chance that this catches anything.

[Mikhail, 2014/04/28 08:00:40]

Oh, thanks for the catch! I've put it for debugging and forgot to remove before
uploading..

+            return a.get() == b.get();
+        }
+        static bool equal(const OwnPtr<P>& a, P* b) { return a == b; }
+        static bool equal(const OwnPtr<P>& a, const PassOwnPtr<P>& b)
+        {
+            RELEASE_ASSERT(!a || a.get() != b.get());
+            return a.get() == b.get();
+        }
+    };
 
     // default hash function for each type
 
     template<typename T> struct DefaultHash;
 
     template<typename T, typename U> struct PairHash {
         static unsigned hash(const std::pair<T, U>& p)
         {
             return pairIntHash(DefaultHash<T>::Hash::hash(p.first), DefaultHash<U>::Hash::hash(p.second));
         }
@@ skipping 27 matching lines @@
 #endif
 
     template<> struct DefaultHash<float> { typedef FloatHash<float> Hash; };
     template<> struct DefaultHash<double> { typedef FloatHash<double> Hash; };
 
     // make PtrHash the default hash function for pointer types that don't specialize
 
     template<typename P> struct DefaultHash<P*> { typedef PtrHash<P*> Hash; };
     template<typename P> struct DefaultHash<RefPtr<P> > { typedef PtrHash<RefPtr<P> > Hash; };
     template<typename P> struct DefaultHash<RawPtr<P> > { typedef PtrHash<RawPtr<P> > Hash; };
+    template<typename P> struct DefaultHash<OwnPtr<P> > { typedef PtrHash<OwnPtr<P> > Hash; };
 
     // make IntPairHash the default hash function for pairs of (at most) 32-bit integers.
 
     template<> struct DefaultHash<std::pair<short, short> > { typedef IntPairHash<short, short> Hash; };
     template<> struct DefaultHash<std::pair<short, unsigned short> > { typedef IntPairHash<short, unsigned short> Hash; };
     template<> struct DefaultHash<std::pair<short, int> > { typedef IntPairHash<short, int> Hash; };
     template<> struct DefaultHash<std::pair<short, unsigned> > { typedef IntPairHash<short, unsigned> Hash; };
     template<> struct DefaultHash<std::pair<unsigned short, short> > { typedef IntPairHash<unsigned short, short> Hash; };
     template<> struct DefaultHash<std::pair<unsigned short, unsigned short> > { typedef IntPairHash<unsigned short, unsigned short> Hash; };
     template<> struct DefaultHash<std::pair<unsigned short, int> > { typedef IntPairHash<unsigned short, int> Hash; };
@@ skipping 11 matching lines @@
 
     template<typename T, typename U> struct DefaultHash<std::pair<T, U> > { typedef PairHash<T, U> Hash; };
 
 } // namespace WTF
 
 using WTF::DefaultHash;
 using WTF::IntHash;
 using WTF::PtrHash;
 
 #endif // WTF_HashFunctions_h