Revert of Slim Skia down to just one murmur3 implementation.

bench/FontCacheBench.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Benchmark.h"
 #include "SkCanvas.h"
-#include "SkChecksum.h"
 #include "SkFontHost.h"
 #include "SkPaint.h"
 #include "SkString.h"
 #include "SkTemplates.h"
 
 #include "gUniqueGlyphIDs.h"
 #define gUniqueGlyphIDs_Sentinel    0xFFFF
 
 static int count_glyphs(const uint16_t start[]) {
     const uint16_t* curr = start;
@@ skipping 37 matching lines @@
     return (value >> bits) | (value << (32 - bits));
 }
 
 typedef uint32_t (*HasherProc)(uint32_t);
 
 static uint32_t hasher0(uint32_t value) {
     value = value ^ (value >> 16);
     return value ^ (value >> 8);
 }
 
+static uint32_t hasher2(uint32_t h) {
+    h ^= h >> 16;
+    h *= 0x85ebca6b;
+    h ^= h >> 13;
+    h *= 0xc2b2ae35;
+    h ^= h >> 16;
+
+    h ^= (h >> 8);
+    return h;
+}
+
 static const struct {
     const char* fName;
     HasherProc  fHasher;
 } gRec[] = {
     { "hasher0",  hasher0 },
-    { "hasher2",  SkChecksum::Mix },
+    { "hasher2",  hasher2 },
 };
 
 #define kMaxHashBits   12
 #define kMaxHashCount  (1 << kMaxHashBits)
 
 static int count_collisions(const uint16_t array[], int count, HasherProc proc,
                             unsigned hashMask) {
     char table[kMaxHashCount];
     sk_bzero(table, sizeof(table));
 
@@ skipping 55 matching lines @@
 private:
     typedef Benchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new FontCacheBench(); )
 
 // undefine this to run the efficiency test
 //DEF_BENCH( return new FontCacheEfficiency(); )