make compare_rendered_pictures process render_pictures's new JSON output format

gm/gm_json.py

Index: gm/gm_json.py
diff --git a/gm/gm_json.py b/gm/gm_json.py
index 6f4b324d46bbd2ce7606671eeab55851b5ce7848..48e0e4d2d78eb10247585b5fcf9413001c83ac0f 100644
--- a/gm/gm_json.py
+++ b/gm/gm_json.py
@@ -23,7 +23,7 @@ import re
 # 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 !

[borenet, 2014/05/06 14:35:48]

This is scary!

[epoger, 2014/05/06 15:13:53]

Agreed.

The good news is that in another CL I am moving these constants from
tools/PictureRenderer.cpp to tools/image_expectations.cpp , which will
eventually merge with gm/gm_expectations.cpp .

We'll still need to keep them in sync between Python and C++ (unless you maybe
have a clever idea to get around that; I'm sure something is POSSIBLE)

[borenet, 2014/05/06 15:26:55]

Off the top of my head - 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'
@@ -75,10 +75,20 @@ JSONKEY_EXPECTEDRESULTS_NOTES = 'notes'
 #   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 = (