Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(275)

Unified Diff: include/private/SkChecksum.h

Issue 1415133003: Move SkChecksum::Murmur3 out of the header. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/core.gypi ('k') | src/core/SkChecksum.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/private/SkChecksum.h
diff --git a/include/private/SkChecksum.h b/include/private/SkChecksum.h
index cbc8a73a3e59e215aee0818fa3fb9f3da009f6ae..4526416fc1535433939304a3c952475e74526b3e 100644
--- a/include/private/SkChecksum.h
+++ b/include/private/SkChecksum.h
@@ -76,44 +76,7 @@ public:
* @param seed Initial hash seed. (optional)
* @return hash result
*/
- static uint32_t Murmur3(const void* data, size_t bytes, uint32_t seed=0) {
- // Use may_alias to remind the compiler we're intentionally violating strict aliasing,
- // and so not to apply strict-aliasing-based optimizations.
- typedef uint32_t SK_ATTRIBUTE(may_alias) aliased_uint32_t;
- typedef uint8_t SK_ATTRIBUTE(may_alias) aliased_uint8_t;
-
- // Handle 4 bytes at a time while possible.
- const aliased_uint32_t* safe_data = (const aliased_uint32_t*)data;
- const size_t words = bytes/4;
- uint32_t hash = seed;
- for (size_t i = 0; i < words; i++) {
- uint32_t k = safe_data[i];
- k *= 0xcc9e2d51;
- k = (k << 15) | (k >> 17);
- k *= 0x1b873593;
-
- hash ^= k;
- hash = (hash << 13) | (hash >> 19);
- hash *= 5;
- hash += 0xe6546b64;
- }
-
- // Handle last 0-3 bytes.
- const aliased_uint8_t* safe_tail = (const uint8_t*)(safe_data + words);
- uint32_t k = 0;
- switch (bytes & 3) {
- case 3: k ^= safe_tail[2] << 16;
- case 2: k ^= safe_tail[1] << 8;
- case 1: k ^= safe_tail[0] << 0;
- k *= 0xcc9e2d51;
- k = (k << 15) | (k >> 17);
- k *= 0x1b873593;
- hash ^= k;
- }
-
- hash ^= bytes;
- return Mix(hash);
- }
+ static uint32_t Murmur3(const void* data, size_t bytes, uint32_t seed=0);
/**
* Compute a 32-bit checksum for a given data block
« no previous file with comments | « gyp/core.gypi ('k') | src/core/SkChecksum.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698