GM: create GmResultDigest that encapsulates digest type ("bitmap-64bitMD5") and value (12345)

gm/gm_expectations.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 "gm_expectations.h"
 #include "SkBitmapHasher.h"
 #include "SkImageDecoder.h"
@@ skipping 25 matching lines @@
 
     SkString SkPathJoin(const char *rootPath, const char *relativePath) {
         SkString result(rootPath);
         if (!result.endsWith(SkPATH_SEPARATOR)) {
             result.appendUnichar(SkPATH_SEPARATOR);
         }
         result.append(relativePath);
         return result;
     }
 
-    // TODO(epoger): This currently assumes that the result SkHashDigest was
-    // generated as an SkHashDigest of an SkBitmap.  We'll need to allow for other
+    // TODO(epoger): This currently assumes that the result hash digest is a
+    // uint64_t generated by SkBitmapHasher.  We'll need to allow for other
     // hash types to cover non-bitmaps.
-    Json::Value ActualResultAsJsonValue(const SkHashDigest& result) {
+    Json::Value ActualResultAsJsonValue(uint64_t result) {
         Json::Value jsonValue;
         jsonValue[kJsonKey_ActualResults_AnyStatus_BitmapHash] = asJsonValue(result);
         return jsonValue;
     }
 
     Json::Value CreateJsonTree(Json::Value expectedResults,
                                Json::Value actualResultsFailed,
                                Json::Value actualResultsFailureIgnored,
                                Json::Value actualResultsNoComparison,
                                Json::Value actualResultsSucceeded) {
@@ skipping 11 matching lines @@
 
     // Expectations class...
 
     Expectations::Expectations(bool ignoreFailure) {
         fIgnoreFailure = ignoreFailure;
     }
 
     Expectations::Expectations(const SkBitmap& bitmap, bool ignoreFailure) {
         fBitmap = bitmap;
         fIgnoreFailure = ignoreFailure;
-        SkHashDigest digest;
+        uint64_t digest;
         // TODO(epoger): Better handling for error returned by ComputeDigest()?
         // For now, we just report a digest of 0 in error cases, like before.
         if (!SkBitmapHasher::ComputeDigest(bitmap, &digest)) {
             digest = 0;
         }
         fAllowedBitmapChecksums.push_back() = digest;
     }
 
     Expectations::Expectations(Json::Value jsonElement) {
         if (jsonElement.empty()) {
@@ skipping 132 matching lines @@
         Json::Reader reader;
         if (!reader.parse(bytes, bytes+size, *jsonRoot)) {
             gm_fprintf(stderr, "error parsing JSON file %s\n", jsonPath);
             DEBUGFAIL_SEE_STDERR;
             return false;
         }
         return true;
     }
 
 }