Add magnifying ability, perceptual diff and improve layout of Skia Tryserver HTML output

compute_engine_scripts/telemetry/telemetry_master_scripts/json_summary_combiner.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.
 
 """Module that combines JSON summaries and outputs the summaries in HTML."""
 
 import glob
 import json
 import optparse
@@ skipping 23 matching lines @@
 NOPATCH_MESA_TEMPLATE_VAR = 'nopatch_mesa'
 WITHPATCH_MESA_TEMPLATE_VAR = 'withpatch_mesa'
 GS_FILES_LOCATION_NO_PATCH_TEMPLATE_VAR = 'gs_http_files_location_nopatch'
 GS_FILES_LOCATION_WITH_PATCH_TEMPLATE_VAR = 'gs_http_files_location_withpatch'
 GS_FILES_LOCATION_DIFFS_TEMPLATE_VAR = 'gs_http_files_location_diffs'
 GS_FILES_LOCATION_WHITE_DIFFS_TEMPLATE_VAR = 'gs_http_files_location_whitediffs'
 
 
 class FileInfo(object):
   """Container class that holds all file data."""
   def __init__(self, file_name, skp_location, num_pixels_differing,

[epoger, 2014/02/03 21:17:13]

Please document parameters (throughout this file)

                percent_pixels_differing, weighted_diff_measure,
-               max_diff_per_channel):
+               max_diff_per_channel, perceptual_diff):
     self.file_name = file_name
     self.diff_file_name = _GetDiffFileName(self.file_name)
     self.skp_location = skp_location
     self.num_pixels_differing = num_pixels_differing
     self.percent_pixels_differing = percent_pixels_differing
     self.weighted_diff_measure = weighted_diff_measure
     self.max_diff_per_channel = max_diff_per_channel
+    self.perceptual_diff = perceptual_diff
 
 
 def _GetDiffFileName(file_name):
   file_name_no_ext, ext = os.path.splitext(file_name)
   return '%s-vs-%s%s' % (file_name_no_ext, file_name_no_ext, ext)
 
 
 class SlaveInfo(object):
   """Container class that holds all slave data."""
   def __init__(self, slave_name, failed_files, skps_location,
@@ skipping 20 matching lines @@
     slave_name = data.keys()[0]
     slave_data = data[slave_name]
     file_info_list = []
     for failed_file in slave_data[json_summary_constants.JSONKEY_FAILED_FILES]:
       failed_file_name = failed_file[json_summary_constants.JSONKEY_FILE_NAME]
       skp_location = posixpath.join(
           STORAGE_HTTP_BASE,
           failed_file[
               json_summary_constants.JSONKEY_SKP_LOCATION].lstrip('gs://'))
       num_pixels_differing = failed_file[
-          json_summary_constants.JSONKEY_NUM_PIXELS_DIFFERING] 
+          json_summary_constants.JSONKEY_NUM_PIXELS_DIFFERING]
       percent_pixels_differing = failed_file[
-          json_summary_constants.JSONKEY_PERCENT_PIXELS_DIFFERING] 
+          json_summary_constants.JSONKEY_PERCENT_PIXELS_DIFFERING]
       weighted_diff_measure = failed_file[
-          json_summary_constants.JSONKEY_WEIGHTED_DIFF_MEASURE] 
+          json_summary_constants.JSONKEY_WEIGHTED_DIFF_MEASURE]
       max_diff_per_channel = failed_file[
-          json_summary_constants.JSONKEY_MAX_DIFF_PER_CHANNEL] 
+          json_summary_constants.JSONKEY_MAX_DIFF_PER_CHANNEL]
+      perceptual_similarity = failed_file[
+          json_summary_constants.JSONKEY_PERCEPTUAL_SIMILARITY]
+      # Convert the perceptual_similarity into the perceptual_diff.
+      perceptual_diff = 100 - (perceptual_similarity * 100)
 
       file_info = FileInfo(
           file_name=failed_file_name,
           skp_location=skp_location,
           num_pixels_differing=num_pixels_differing,
           percent_pixels_differing=percent_pixels_differing,
           weighted_diff_measure=weighted_diff_measure,
-          max_diff_per_channel=max_diff_per_channel)
+          max_diff_per_channel=max_diff_per_channel,
+          perceptual_diff=perceptual_diff)
       file_info_list.append(file_info)
 
     slave_info = SlaveInfo(
         slave_name=slave_name,
         failed_files=file_info_list,
         skps_location=slave_data[json_summary_constants.JSONKEY_SKPS_LOCATION],
         files_location_nopatch=slave_data[
             json_summary_constants.JSONKEY_FILES_LOCATION_NOPATCH],
         files_location_withpatch=slave_data[
             json_summary_constants.JSONKEY_FILES_LOCATION_WITHPATCH],
@@ skipping 91 matching lines @@
         'Must specify json_summaries_dir, output_html_dir, '
         'render_pictures_args, nopatch_mesa and withpatch_mesa')
 
   OutputToHTML(
       slave_name_to_info=CombineJsonSummaries(options.json_summaries_dir),
       output_html_dir=options.output_html_dir,
       absolute_url=options.absolute_url,
       render_pictures_args=options.render_pictures_args,
       nopatch_mesa=options.nopatch_mesa,
       withpatch_mesa=options.withpatch_mesa)