make compare_rendered_pictures process render_pictures's new JSON output format

gm/gm_json.py

 #!/usr/bin/env python
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Schema of the JSON summary file written out by the GM tool.
 
 This must be kept in sync with the kJsonKey_ constants in gm_expectations.cpp !
 """
 
 __author__ = 'Elliot Poger'
 
 
 # system-level imports
 import io
 import json
 import os
 import posixpath
 import re
 
 
 # Key strings used in GM results JSON files (both expected-results.json and
 # actual-results.json).
 #
 # NOTE: These constants must be kept in sync with the kJsonKey_ constants in
-# gm_expectations.cpp !
+# gm_expectations.cpp and tools/PictureRenderer.cpp !
+# Eric suggests: create gm/gm_expectations_constants.h containing ONLY variable
+# declarations so as to be readable by both gm/gm_expectations.cpp and Python.
 
 
 JSONKEY_ACTUALRESULTS = 'actual-results'
 
 # Tests whose results failed to match expectations.
 JSONKEY_ACTUALRESULTS_FAILED = 'failed'
 
 # Tests whose results failed to match expectations, but IGNOREFAILURE causes
 # us to take them less seriously.
 JSONKEY_ACTUALRESULTS_FAILUREIGNORED = 'failure-ignored'
@@ skipping 31 matching lines @@
 
 # Optional: boolean indicating whether this expectation was reviewed/approved
 # by a human being.
 # If True: a human looked at this image and approved it.
 # If False: this expectation was committed blind.  (In such a case, please
 #   add notes indicating why!)
 # If absent: this expectation was committed by a tool that didn't enforce human
 #   review of expectations.
 JSONKEY_EXPECTEDRESULTS_REVIEWED = 'reviewed-by-human'
 
-
 # Allowed hash types for test expectations.
 JSONKEY_HASHTYPE_BITMAP_64BITMD5 = 'bitmap-64bitMD5'
 
+JSONKEY_HEADER = 'header'
+JSONKEY_HEADER_TYPE = 'type'
+JSONKEY_HEADER_REVISION = 'revision'
+JSONKEY_IMAGE_CHECKSUMALGORITHM = 'checksumAlgorithm'
+JSONKEY_IMAGE_CHECKSUMVALUE = 'checksumValue'
+JSONKEY_IMAGE_COMPARISONRESULT = 'comparisonResult'
+JSONKEY_IMAGE_FILEPATH = 'filepath'
+JSONKEY_SOURCE_TILEDIMAGES = 'tiled-images'
+JSONKEY_SOURCE_WHOLEIMAGE = 'whole-image'
+
+
 # Root directory where the buildbots store their actually-generated images...
 #  as a publicly readable HTTP URL:
 GM_ACTUALS_ROOT_HTTP_URL = (
     'http://chromium-skia-gm.commondatastorage.googleapis.com/gm')
 #  as a GS URL that allows credential-protected write access:
 GM_ACTUALS_ROOT_GS_URL = 'gs://chromium-skia-gm/gm'
 
 # Root directory where buildbots store skimage actual results json files.
 SKIMAGE_ACTUALS_BASE_URL = (
     'http://chromium-skia-gm.commondatastorage.googleapis.com/skimage/actuals')
@@ skipping 77 matching lines @@
 
 
 def WriteToFile(json_dict, file_path):
   """Writes the JSON summary in json_dict out to file_path.
 
   The file is written Unix-style (each line ends with just LF, not CRLF);
   see https://code.google.com/p/skia/issues/detail?id=1815 for reasons."""
   with io.open(file_path, mode='w', newline='', encoding='utf-8') as outfile:
     outfile.write(unicode(json.dumps(json_dict, outfile, sort_keys=True,
                                      indent=2)))