Changeset 32650 in webkit for trunk/JavaScriptCore/wtf/HashTraits.h

Timestamp:

Apr 28, 2008, 10:18:15 AM (17 years ago)

Author:

Darin Adler

Message:

2008-04-28 Darin Adler <Darin Adler>

Reviewed by Adam.

• make sure RefPtr's default hash doesn't ref/deref when computing the hash
• remove remnants of the hash table storage type optimization

• wtf/HashFunctions.h: Used "using" to get the hash and equal functions from PtrHash<P*> into PtrHash<RefPtr<P>>.

• wtf/HashMap.h: Replaced uses of PairBaseHashTraits with PairHashTraits. Eliminated storage-related typedefs. Removed constructor, destructor, copy constructor, and destructor since the compiler-generated ones are fine. Removed refAll and derefAll. Took out unnnecessary typecasts. Removed use of RefCounter.

• wtf/HashSet.h: Eliminated storage-related typedefs. Removed constructor, destructor, copy constructor, and destructor since the compiler-generated ones are fine. Removed refAll and derefAll. Removed unneeded template arguents from HashSetTranslatorAdapter. Eliminated unneeded HashSetTranslator template.

• wtf/HashTable.h: Tweaked formatting. Removed NeedsRef, RefCounterBase, RefCounter, HashTableRefCounterBase, HashTableRefCounter, and Assigner class templates.

• wtf/HashTraits.h: Removed StorageTraits, needsRef, PairBaseHashTraits, and HashKeyStorageTraits.

• wtf/RefPtrHashMap.h: Made all the same fixes as in HashMap. Also made the corresponding changes to RefPtrHashMapRawKeyTranslator.

File:

• trunk/JavaScriptCore/wtf/HashTraits.h (modified) (3 diffs)

trunk/JavaScriptCore/wtf/HashTraits.h

@@ -93 +93 @@
     template<typename T> struct GenericHashTraits : GenericHashTraitsBase<IsInteger<T>::value, T> {
         typedef T TraitType;
-        typedef HashTraits<T> StorageTraits;
         static T emptyValue() { return T(); }
-        static const bool needsRef = false;
     };
 
@@ -125 +123 @@
     // special traits for pairs, helpful for their use in HashMap implementation
 
-    template<typename FirstTraits, typename SecondTraits> struct PairHashTraits;
-
     template<typename FirstTraitsArg, typename SecondTraitsArg>
     struct PairHashTraits : GenericHashTraits<pair<typename FirstTraitsArg::TraitType, typename SecondTraitsArg::TraitType> > {
@@ -142 +138 @@
     };
 
-    template<typename FirstTraits, typename SecondTraits>
-    struct PairBaseHashTraits : PairHashTraits<FirstTraits, SecondTraits> { };
-
     template<typename First, typename Second>
     struct HashTraits<pair<First, Second> > : public PairHashTraits<HashTraits<First>, HashTraits<Second> > { };
-
-    // obsolete code sharing traits -- to be deleted
-    template<typename HashArg, typename TraitsArg> struct HashKeyStorageTraits {
-        typedef HashArg Hash;
-        typedef TraitsArg Traits;
-    };
 
 } // namespace WTF