GM: specify that currently used checksums are CityHashes of SkBitmaps

gm/gmmain.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*
  * Code for the "gm" (Golden Master) rendering comparison tool.
  *
@@ skipping 748 matching lines @@
 
         if (addToJsonSummary) {
             add_actual_results_to_json_summary(completeName, actualBitmapHash, errors,
                                                expectations.ignoreFailure());
             add_expected_results_to_json_summary(completeName, expectations);
         }
 
         return errors;
     }
 
+    // EPOGER: move this into gm_expectations.h (or a .cpp file) to isolate the code that knows about JSON structure
     /**
      * Add this result to the appropriate JSON collection of actual results,
      * depending on status.
      */
+    // EPOGER: replace SkHashDigest actualBitmapHash with a level of indirection: resultDigest, which may be a BitmapCityhash or a BytewiseCityhash.
     void add_actual_results_to_json_summary(const char testName[],
                                             const SkHashDigest& actualBitmapHash,
                                             ErrorCombination result,
                                             bool ignoreFailure) {
         Json::Value actualResults;
-        actualResults[kJsonKey_ActualResults_AnyStatus_Checksum] =
+        actualResults[kJsonKey_ActualResults_AnyStatus_BitmapCityhash] =
             asJsonValue(actualBitmapHash);
         if (result.isEmpty()) {
             this->fJsonActualResults_Succeeded[testName] = actualResults;
         } else {
             if (ignoreFailure) {
                 // TODO: Once we have added the ability to compare
                 // actual results against expectations in a JSON file
                 // (where we can set ignore-failure to either true or
                 // false), add test cases that exercise ignored
                 // failures (both for kMissingExpectations_ErrorType
@@ skipping 26 matching lines @@
 
     /**
      * Add this test to the JSON collection of expected results.
      */
     void add_expected_results_to_json_summary(const char testName[],
                                               Expectations expectations) {
         // For now, we assume that this collection starts out empty and we
         // just fill it in as we go; once gm accepts a JSON file as input,
         // we'll have to change that.
         Json::Value expectedResults;
-        expectedResults[kJsonKey_ExpectedResults_Checksums] =
+        expectedResults[kJsonKey_ExpectedResults_AllowedBitmapCityhashes] =
             expectations.allowedChecksumsAsJson();
         expectedResults[kJsonKey_ExpectedResults_IgnoreFailure] =
             expectations.ignoreFailure();
         this->fJsonExpectedResults[testName] = expectedResults;
     }
 
     /**
      * Compare actualBitmap to expectations stored in this->fExpectationsSource.
      *
      * @param gm which test generated the actualBitmap
@@ skipping 1166 matching lines @@
     if (FLAGS_forceBWtext) {
         canvas->setDrawFilter(SkNEW(BWTextDrawFilter))->unref();
     }
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif