GM: specify that currently used checksums are CityHashes of SkBitmaps

gm/gmmain.cpp

Index: gm/gmmain.cpp
===================================================================
--- gm/gmmain.cpp	(revision 8850)
+++ gm/gmmain.cpp	(working copy)
@@ -63,6 +63,8 @@
 typedef int GLContextType;
 #endif
 
+#define DEBUGFAIL_SEE_STDERR SkDEBUGFAIL("see stderr for message")
+
 extern bool gSkSuppressFontCachePurgeSpew;
 
 #ifdef SK_SUPPORT_PDF
@@ -766,16 +768,18 @@
         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;
@@ -822,7 +826,7 @@
         // 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();