| Index: gm/rebaseline_server/compare_rendered_pictures.py
|
| diff --git a/gm/rebaseline_server/compare_rendered_pictures.py b/gm/rebaseline_server/compare_rendered_pictures.py
|
| index 75a80d4de2704afc527c2ad7aa1834ac61f4888d..b8b4cfe42b8022396435b89a9fda7cc06214ce89 100755
|
| --- a/gm/rebaseline_server/compare_rendered_pictures.py
|
| +++ b/gm/rebaseline_server/compare_rendered_pictures.py
|
| @@ -18,10 +18,6 @@ import time
|
|
|
| # Imports from within Skia
|
| #
|
| -# TODO(epoger): Once we move the create_filepath_url() function out of
|
| -# download_actuals into a shared utility module, we won't need to import
|
| -# download_actuals anymore.
|
| -#
|
| # We need to add the 'gm' directory, so that we can import gm_json.py within
|
| # that directory. That script allows us to parse the actual-results.json file
|
| # written out by the GM tool.
|
| @@ -32,12 +28,12 @@ GM_DIRECTORY = os.path.dirname(PARENT_DIRECTORY)
|
| TRUNK_DIRECTORY = os.path.dirname(GM_DIRECTORY)
|
| if GM_DIRECTORY not in sys.path:
|
| sys.path.append(GM_DIRECTORY)
|
| -import download_actuals
|
| import gm_json
|
| import imagediffdb
|
| import imagepair
|
| import imagepairset
|
| import results
|
| +import url_utils
|
|
|
| # URL under which all render_pictures images can be found in Google Storage.
|
| # TODO(epoger): Move this default value into
|
| @@ -74,7 +70,7 @@ class RenderedPicturesComparisons(results.BaseComparisons):
|
| self._image_base_url = image_base_url
|
| self._diff_base_url = (
|
| diff_base_url or
|
| - download_actuals.create_filepath_url(generated_images_root))
|
| + url_utils.create_filepath_url(generated_images_root))
|
| self._load_result_pairs(actuals_root, subdirs)
|
| self._timestamp = int(time.time())
|
| logging.info('Results complete; took %d seconds.' %
|
|
|