this->append(name);
this->append(md5);
}
- static uint32_t Hash(const Gold& g) { return SkGoodHash((const SkString&)g); }
+ struct Hash {
+ uint32_t operator()(const Gold& g) const {
+ return SkGoodHash()((const SkString&)g);
+ }
+ };
};
static SkTHashSet<Gold, Gold::Hash> gGold;
// SkGoodHash should usually be your first choice in hashing data.
// It should be both reasonably fast and high quality.
-
-template <typename K>
-uint32_t SkGoodHash(const K& k) {
- if (sizeof(K) == 4) {
+struct SkGoodHash {
+ template <typename K>
+ SK_WHEN(sizeof(K) == 4, uint32_t) operator()(const K& k) const {
return SkChecksum::Mix(*(const uint32_t*)&k);
}
- return SkChecksum::Murmur3(&k, sizeof(K));
-}
-inline uint32_t SkGoodHash(const SkString& k) {
- return SkChecksum::Murmur3(k.c_str(), k.size());
-}
+ template <typename K>
+ SK_WHEN(sizeof(K) != 4, uint32_t) operator()(const K& k) const {
+ return SkChecksum::Murmur3(&k, sizeof(K));
+ }
+
+ uint32_t operator()(const SkString& k) const {
+ return SkChecksum::Murmur3(k.c_str(), k.size());
+ }
+};
#endif
// Maps K->V. A more user-friendly wrapper around SkTHashTable, suitable for most use cases.
// K and V are treated as ordinary copyable C++ types, with no assumed relationship between the two.
-template <typename K, typename V, uint32_t(*HashK)(const K&) = &SkGoodHash>
+template <typename K, typename V, typename HashK = SkGoodHash>
class SkTHashMap : SkNoncopyable {
public:
SkTHashMap() {}
K key;
V val;
static const K& GetKey(const Pair& p) { return p.key; }
- static uint32_t Hash(const K& key) { return HashK(key); }
+ static uint32_t Hash(const K& key) { return HashK()(key); }
};
SkTHashTable<Pair, K> fTable;
};
// A set of T. T is treated as an ordiary copyable C++ type.
-template <typename T, uint32_t(*HashT)(const T&) = &SkGoodHash>
+template <typename T, typename HashT = SkGoodHash>
class SkTHashSet : SkNoncopyable {
public:
SkTHashSet() {}
private:
struct Traits {
static const T& GetKey(const T& item) { return item; }
- static uint32_t Hash(const T& item) { return HashT(item); }
+ static uint32_t Hash(const T& item) { return HashT()(item); }
};
SkTHashTable<T, T, Traits> fTable;
};
SkASSERT(rhs.fPtr);
return *fPtr == *rhs.fPtr;
}
- static uint32_t Hash(const WrapGS& w) {
- SkASSERT(w.fPtr);
- return w.fPtr->hash();
- }
+ struct Hash {
+ uint32_t operator()(const WrapGS& w) const {
+ SkASSERT(w.fPtr);
+ return w.fPtr->hash();
+ }
+ };
};
SkTHashSet<WrapGS, WrapGS::Hash> fGraphicStateRecords;
}
DEF_TEST(GoodHash, r) {
- ASSERT(SkGoodHash(( int32_t)4) == 614249093); // 4 bytes. Hits SkChecksum::Mix fast path.
- ASSERT(SkGoodHash((uint32_t)4) == 614249093); // (Ditto)
+ ASSERT(SkGoodHash()(( int32_t)4) == 614249093); // 4 bytes. Hits SkChecksum::Mix fast path.
+ ASSERT(SkGoodHash()((uint32_t)4) == 614249093); // (Ditto)
// None of these are 4 byte sized, so they use SkChecksum::Murmur3, not SkChecksum::Mix.
- ASSERT(SkGoodHash((uint64_t)4) == 3491892518);
- ASSERT(SkGoodHash((uint16_t)4) == 899251846);
- ASSERT(SkGoodHash( (uint8_t)4) == 962700458);
+ ASSERT(SkGoodHash()((uint64_t)4) == 3491892518);
+ ASSERT(SkGoodHash()((uint16_t)4) == 899251846);
+ ASSERT(SkGoodHash()( (uint8_t)4) == 962700458);
// Tests SkString is correctly specialized.
- ASSERT(SkGoodHash(SkString("Hi")) == 55667557);
+ ASSERT(SkGoodHash()(SkString("Hi")) == 55667557);
}
uint32_t* fCounter;
};
-uint32_t hash_copy_counter(const CopyCounter&) {
- return 0; // let them collide, what do we care?
-}
+struct HashCopyCounter {
+ uint32_t operator()(const CopyCounter&) const {
+ return 0; // let them collide, what do we care?
+ }
+};
}
DEF_TEST(HashSetCopyCounter, r) {
- SkTHashSet<CopyCounter, hash_copy_counter> set;
+ SkTHashSet<CopyCounter, HashCopyCounter> set;
uint32_t globalCounter = 0;
CopyCounter copyCounter1(1, &globalCounter);