GM: create GmResultDigest that encapsulates digest type ("bitmap-64bitMD5") and value (12345)
R=scroggo@google.com
Review URL: https://codereview.chromium.org/15883004
git-svn-id: http://skia.googlecode.com/svn/trunk@9271 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/utils/SkBitmapHasher.cpp b/src/utils/SkBitmapHasher.cpp
index 5342d18..9f0affd 100644
--- a/src/utils/SkBitmapHasher.cpp
+++ b/src/utils/SkBitmapHasher.cpp
@@ -30,8 +30,7 @@
return SkEndian_SwapLE64(*(reinterpret_cast<const uint64_t *>(bytearray)));
}
-/*static*/ bool SkBitmapHasher::ComputeDigestInternal(const SkBitmap& bitmap,
- SkHashDigest *result) {
+/*static*/ bool SkBitmapHasher::ComputeDigestInternal(const SkBitmap& bitmap, uint64_t *result) {
SkMD5 out;
// start with the x/y dimensions
@@ -50,7 +49,7 @@
return true;
}
-/*static*/ bool SkBitmapHasher::ComputeDigest(const SkBitmap& bitmap, SkHashDigest *result) {
+/*static*/ bool SkBitmapHasher::ComputeDigest(const SkBitmap& bitmap, uint64_t *result) {
if (ComputeDigestInternal(bitmap, result)) {
return true;
}
diff --git a/src/utils/SkBitmapHasher.h b/src/utils/SkBitmapHasher.h
index 165da3d..d52a6d7 100644
--- a/src/utils/SkBitmapHasher.h
+++ b/src/utils/SkBitmapHasher.h
@@ -11,12 +11,8 @@
#include "SkBitmap.h"
-// TODO(epoger): Soon, SkHashDigest will become a real class of its own,
-// and callers won't be able to assume it converts to/from a uint64_t.
-typedef uint64_t SkHashDigest;
-
/**
- * Static class that can generate an SkHashDigest from an SkBitmap.
+ * Static class that generates a uint64 hash digest from an SkBitmap.
*/
class SkBitmapHasher {
public:
@@ -30,10 +26,10 @@
* intermediate SkBitmap and copy the pixels over to it... so in some
* cases, performance and memory usage can suffer.
*/
- static bool ComputeDigest(const SkBitmap& bitmap, SkHashDigest *result);
+ static bool ComputeDigest(const SkBitmap& bitmap, uint64_t *result);
private:
- static bool ComputeDigestInternal(const SkBitmap& bitmap, SkHashDigest *result);
+ static bool ComputeDigestInternal(const SkBitmap& bitmap, uint64_t *result);
};
#endif