Index: third_party/WebKit/Source/platform/graphics/skia/SkSizeHash.h |
diff --git a/third_party/WebKit/Source/platform/graphics/skia/SkSizeHash.h b/third_party/WebKit/Source/platform/graphics/skia/SkSizeHash.h |
index 679d41add45a1661105dd4798fdeaf2a49db6445..cba9e73030154aa36a28d39320514950926cc1bb 100644 |
--- a/third_party/WebKit/Source/platform/graphics/skia/SkSizeHash.h |
+++ b/third_party/WebKit/Source/platform/graphics/skia/SkSizeHash.h |
@@ -34,16 +34,19 @@ |
namespace WTF { |
template<> struct IntHash<SkSize> { |
+ STATIC_ONLY(IntHash); |
static unsigned hash(const SkSize& key) { return pairIntHash(key.width(), key.height()); } |
static bool equal(const SkSize& a, const SkSize& b) { return a == b; } |
static const bool safeToCompareToEmptyOrDeleted = true; |
}; |
template<> struct DefaultHash<SkSize> { |
+ STATIC_ONLY(DefaultHash); |
typedef IntHash<SkSize> Hash; |
}; |
template<> struct HashTraits<SkSize> : GenericHashTraits<SkSize> { |
+ STATIC_ONLY(HashTraits); |
static const bool emptyValueIsZero = true; |
static SkSize emptyValue() { return SkSize::Make(0, 0); } |
static void constructDeletedValue(SkSize& slot, bool) |
@@ -57,16 +60,19 @@ template<> struct HashTraits<SkSize> : GenericHashTraits<SkSize> { |
}; |
template<> struct IntHash<SkISize> { |
+ STATIC_ONLY(IntHash); |
static unsigned hash(const SkISize& key) { return pairIntHash(key.width(), key.height()); } |
static bool equal(const SkISize& a, const SkISize& b) { return a == b; } |
static const bool safeToCompareToEmptyOrDeleted = true; |
}; |
template<> struct DefaultHash<SkISize> { |
+ STATIC_ONLY(DefaultHash); |
typedef IntHash<SkISize> Hash; |
}; |
template<> struct HashTraits<SkISize> : GenericHashTraits<SkISize> { |
+ STATIC_ONLY(HashTraits); |
static const bool emptyValueIsZero = true; |
static SkISize emptyValue() { return SkISize::Make(0, 0); } |
static void constructDeletedValue(SkISize& slot, bool) |