SkBitmapHasher: use 64-bit-truncated MD5 instead of 64-bit CityHash

BUG=https://code.google.com/p/skia/issues/detail?id=1257

(if we change our mind within the next few days, we can toggle the
BITMAPHASHER_USES_TRUNCATED_MD5 #ifdef ; at some point, we'll remove that
option so we can delete our CityHash implementation entirely)

R=bungeman@google.com

Review URL: https://codereview.chromium.org/14054012

git-svn-id: http://skia.googlecode.com/svn/trunk@8992 2bbb7eff-a529-9590-31e7-b0007b416f81

12 files changed, 44 insertions, 44 deletions

diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/json-summary.txt
index 5214f7a0d9..b8d43a37e3 100644
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/json-summary.txt
@@ -2,10 +2,10 @@
    "actual-results" : {
       "failed" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 9512553915271796906
+            "bitmap-cityhash" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 14022967492765711532
+            "bitmap-cityhash" : 1209453360120438698
          }
       },
       "failure-ignored" : null,
@@ -14,11 +14,11 @@
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 11071285354315388429 ],
+         "allowed-bitmap-cityhashes" : [ 8863920166200910451 ],
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 16527650414256125612 ],
+         "allowed-bitmap-cityhashes" : [ 13451349865803053525 ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt
index 5214f7a0d9..b8d43a37e3 100644
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt
@@ -2,10 +2,10 @@
    "actual-results" : {
       "failed" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 9512553915271796906
+            "bitmap-cityhash" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 14022967492765711532
+            "bitmap-cityhash" : 1209453360120438698
          }
       },
       "failure-ignored" : null,
@@ -14,11 +14,11 @@
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 11071285354315388429 ],
+         "allowed-bitmap-cityhashes" : [ 8863920166200910451 ],
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 16527650414256125612 ],
+         "allowed-bitmap-cityhashes" : [ 13451349865803053525 ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt
index 31892c91f7..e55c38c5fa 100644
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt
@@ -4,10 +4,10 @@
       "failure-ignored" : null,
       "no-comparison" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 9512553915271796906
+            "bitmap-cityhash" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 14022967492765711532
+            "bitmap-cityhash" : 1209453360120438698
          }
       },
       "succeeded" : null
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/json-summary.txt
index 417e3d89ab..e050124767 100644
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/json-summary.txt
@@ -5,20 +5,20 @@
       "no-comparison" : null,
       "succeeded" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 9512553915271796906
+            "bitmap-cityhash" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 14022967492765711532
+            "bitmap-cityhash" : 1209453360120438698
          }
       }
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 9512553915271796906 ],
+         "allowed-bitmap-cityhashes" : [ 12927999507540085554 ],
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 14022967492765711532 ],
+         "allowed-bitmap-cityhashes" : [ 1209453360120438698 ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/json-summary.txt
index 417e3d89ab..e050124767 100644
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/json-summary.txt
@@ -5,20 +5,20 @@
       "no-comparison" : null,
       "succeeded" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 9512553915271796906
+            "bitmap-cityhash" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 14022967492765711532
+            "bitmap-cityhash" : 1209453360120438698
          }
       }
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 9512553915271796906 ],
+         "allowed-bitmap-cityhashes" : [ 12927999507540085554 ],
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 14022967492765711532 ],
+         "allowed-bitmap-cityhashes" : [ 1209453360120438698 ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/json-summary.txt
index 417e3d89ab..e050124767 100644
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/json-summary.txt
@@ -5,20 +5,20 @@
       "no-comparison" : null,
       "succeeded" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 9512553915271796906
+            "bitmap-cityhash" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 14022967492765711532
+            "bitmap-cityhash" : 1209453360120438698
          }
       }
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 9512553915271796906 ],
+         "allowed-bitmap-cityhashes" : [ 12927999507540085554 ],
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 14022967492765711532 ],
+         "allowed-bitmap-cityhashes" : [ 1209453360120438698 ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/json-summary.txt
index 417e3d89ab..e050124767 100644
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/json-summary.txt
@@ -5,20 +5,20 @@
       "no-comparison" : null,
       "succeeded" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 9512553915271796906
+            "bitmap-cityhash" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 14022967492765711532
+            "bitmap-cityhash" : 1209453360120438698
          }
       }
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 9512553915271796906 ],
+         "allowed-bitmap-cityhashes" : [ 12927999507540085554 ],
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 14022967492765711532 ],
+         "allowed-bitmap-cityhashes" : [ 1209453360120438698 ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt
index 5214f7a0d9..b8d43a37e3 100644
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt
+++ b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt
@@ -2,10 +2,10 @@
    "actual-results" : {
       "failed" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 9512553915271796906
+            "bitmap-cityhash" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 14022967492765711532
+            "bitmap-cityhash" : 1209453360120438698
          }
       },
       "failure-ignored" : null,
@@ -14,11 +14,11 @@
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 11071285354315388429 ],
+         "allowed-bitmap-cityhashes" : [ 8863920166200910451 ],
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 16527650414256125612 ],
+         "allowed-bitmap-cityhashes" : [ 13451349865803053525 ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/json-summary.txt b/gm/tests/outputs/intentionally-skipped-tests/output-expected/json-summary.txt
index 1ee2207f42..3d3e1e4d0f 100644
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/json-summary.txt
+++ b/gm/tests/outputs/intentionally-skipped-tests/output-expected/json-summary.txt
@@ -4,16 +4,16 @@
       "failure-ignored" : null,
       "no-comparison" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 9512553915271796906
+            "bitmap-cityhash" : 12927999507540085554
          },
          "565/selftest2" : {
-            "bitmap-cityhash" : 11071285354315388429
+            "bitmap-cityhash" : 8863920166200910451
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 14022967492765711532
+            "bitmap-cityhash" : 1209453360120438698
          },
          "8888/selftest2" : {
-            "bitmap-cityhash" : 16527650414256125612
+            "bitmap-cityhash" : 13451349865803053525
          }
       },
       "succeeded" : null
diff --git a/gm/tests/outputs/no-readpath/output-expected/json-summary.txt b/gm/tests/outputs/no-readpath/output-expected/json-summary.txt
index c2325d09f5..5140616bf0 100644
--- a/gm/tests/outputs/no-readpath/output-expected/json-summary.txt
+++ b/gm/tests/outputs/no-readpath/output-expected/json-summary.txt
@@ -4,10 +4,10 @@
       "failure-ignored" : null,
       "no-comparison" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 9512553915271796906
+            "bitmap-cityhash" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 14022967492765711532
+            "bitmap-cityhash" : 1209453360120438698
          }
       },
       "succeeded" : null
diff --git a/gm/tests/outputs/nonverbose/output-expected/json-summary.txt b/gm/tests/outputs/nonverbose/output-expected/json-summary.txt
index 31892c91f7..e55c38c5fa 100644
--- a/gm/tests/outputs/nonverbose/output-expected/json-summary.txt
+++ b/gm/tests/outputs/nonverbose/output-expected/json-summary.txt
@@ -4,10 +4,10 @@
       "failure-ignored" : null,
       "no-comparison" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 9512553915271796906
+            "bitmap-cityhash" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 14022967492765711532
+            "bitmap-cityhash" : 1209453360120438698
          }
       },
       "succeeded" : null
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/json-summary.txt b/gm/tests/outputs/pipe-playback-failure/output-expected/json-summary.txt
index 54e0bde430..506191d981 100644
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/json-summary.txt
+++ b/gm/tests/outputs/pipe-playback-failure/output-expected/json-summary.txt
@@ -2,31 +2,31 @@
    "actual-results" : {
       "failed" : {
          "comparison/selftest1-pipe" : {
-            "bitmap-cityhash" : 4259036727585789440
+            "bitmap-cityhash" : 6140979239232854774
          }
       },
       "failure-ignored" : null,
       "no-comparison" : null,
       "succeeded" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 9512553915271796906
+            "bitmap-cityhash" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 14022967492765711532
+            "bitmap-cityhash" : 1209453360120438698
          }
       }
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 9512553915271796906 ],
+         "allowed-bitmap-cityhashes" : [ 12927999507540085554 ],
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 14022967492765711532 ],
+         "allowed-bitmap-cityhashes" : [ 1209453360120438698 ],
          "ignore-failure" : false
       },
       "comparison/selftest1-pipe" : {
-         "allowed-bitmap-cityhashes" : [ 14022967492765711532 ],
+         "allowed-bitmap-cityhashes" : [ 1209453360120438698 ],
          "ignore-failure" : false
       }
    }