Add ability to rebaseline skimage to rebaseline.py

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 json
+import os
 
 
 # Key strings used in GM results JSON files (both expected-results.json and
 # actual-results.json).
 #
 # These constants must be kept in sync with the kJsonKey_ constants in
 # gm_expectations.cpp !
 
 
 JSONKEY_ACTUALRESULTS = 'actual-results'
@@ skipping 49 matching lines @@
 # Allowed hash types for test expectations.
 JSONKEY_HASHTYPE_BITMAP_64BITMD5 = 'bitmap-64bitMD5'
 
 # 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')
+# Root directory inside trunk where skimage expectations are stored.
+SKIMAGE_EXPECTATIONS_ROOT = os.path.join('expectations', 'skimage')
+
 # Pattern used to assemble each image's filename
 IMAGE_FILENAME_PATTERN = '(\S+)_(\S+)\.png'  # matches (testname, config)
 
 def CreateGmActualUrl(test_name, hash_type, hash_digest,
                       gm_actuals_root_url=GM_ACTUALS_ROOT_HTTP_URL):
   """Return the URL we can use to download a particular version of
   the actually-generated image for this particular GM test.
 
   test_name: name of the test, e.g. 'perlinnoise'
   hash_type: string indicating the hash type used to generate hash_digest,
@@ skipping 18 matching lines @@
   """Loads the JSON summary written out by the GM tool.
      Returns a dictionary keyed by the values listed as JSONKEY_ constants
      above."""
   file_contents = open(file_path, 'r').read()
   return LoadFromString(file_contents)
 
 def WriteToFile(json_dict, file_path):
   """Writes the JSON summary in json_dict out to file_path."""
   with open(file_path, 'w') as outfile:
     json.dump(json_dict, outfile, sort_keys=True, indent=2)