teach rebaseline_server to generate diffs of rendered SKPs

gm/rebaseline_server/static/live-loader.js

 /*
  * Loader:
  * Reads GM result reports written out by results.py, and imports
  * them into $scope.extraColumnHeaders and $scope.imagePairs .
  */
 var Loader = angular.module(
     'Loader',
     ['ConstantsModule']
 );
 
@@ skipping 109 matching lines @@
   }
 );
 
 
 Loader.controller(
   'Loader.Controller',
     function($scope, $http, $filter, $location, $log, $timeout, constants) {
     $scope.readyToDisplay = false;
     $scope.constants = constants;
     $scope.windowTitle = "Loading GM Results...";
-    $scope.resultsToLoad = $location.search().resultsToLoad;
+    $scope.actualsDir = $location.search().actualsDir;

[epoger, 2014/07/31 15:18:31]

Copied this file from the original loader.js and modified it.

Hopefully, eventually we can delete loader.js and just use this one.

+    $scope.expectationsDir = $location.search().expectationsDir;
     $scope.loadingMessage = "please wait...";
 
     /**
      * On initial page load, load a full dictionary of results.
      * Once the dictionary is loaded, unhide the page elements so they can
      * render the data.
      */
-    $http.get($scope.resultsToLoad).success(
+    var liveQueryUrl = "/live-results/actualsDir=" + $scope.actualsDir +
+        "&expectationsDir=" + $scope.expectationsDir;
+    $http.get(liveQueryUrl).success(
       function(data, status, header, config) {
         var dataHeader = data[constants.KEY__ROOT__HEADER];
         if (dataHeader[constants.KEY__HEADER__SCHEMA_VERSION] !=
             constants.VALUE__HEADER__SCHEMA_VERSION) {
           $scope.loadingMessage = "ERROR: Got JSON file with schema version "
               + dataHeader[constants.KEY__HEADER__SCHEMA_VERSION]
               + " but expected schema version "
               + constants.VALUE__HEADER__SCHEMA_VERSION;
         } else if (dataHeader[constants.KEY__HEADER__IS_STILL_LOADING]) {
           // Apply the server's requested reload delay to local time,
@@ skipping 91 matching lines @@
 
           // TODO(epoger): Special handling for RESULT_TYPE column:
           // by default, show only KEY__RESULT_TYPE__FAILED results
           $scope.showingColumnValues[constants.KEY__EXTRACOLUMNS__RESULT_TYPE] = {};
           $scope.showingColumnValues[constants.KEY__EXTRACOLUMNS__RESULT_TYPE][
               constants.KEY__RESULT_TYPE__FAILED] = true;
 
           // Set up mapping for URL parameters.
           // parameter name -> copier object to load/save parameter value
           $scope.queryParameters.map = {
-            'resultsToLoad':         $scope.queryParameters.copiers.simple,
+            'actualsDir':            $scope.queryParameters.copiers.simple,
+            'expectationsDir':       $scope.queryParameters.copiers.simple,
             'displayLimitPending':   $scope.queryParameters.copiers.simple,
             'showThumbnailsPending': $scope.queryParameters.copiers.simple,
             'mergeIdenticalRowsPending': $scope.queryParameters.copiers.simple,
             'imageSizePending':      $scope.queryParameters.copiers.simple,
             'sortColumnSubdict':     $scope.queryParameters.copiers.simple,
             'sortColumnKey':         $scope.queryParameters.copiers.simple,
           };
           // Some parameters are handled differently based on whether they USE_FREEFORM_FILTER.
           angular.forEach(
             $scope.filterableColumnNames,
@@ skipping 14 matching lines @@
 
           // Any image URLs which are relative should be relative to the JSON
           // file's source directory; absolute URLs should be left alone.
           var baseUrlKey = constants.KEY__IMAGESETS__FIELD__BASE_URL;
           angular.forEach(
             $scope.imageSets,
             function(imageSet) {
               var baseUrl = imageSet[baseUrlKey];
               if ((baseUrl.substring(0, 1) != '/') &&
                   (baseUrl.indexOf('://') == -1)) {
+                // EPOGER: we don't have resultsToLoad anymore... what should this be set to?
                 imageSet[baseUrlKey] = $scope.resultsToLoad + '/../' + baseUrl;
               }
             }
           );
 
           $scope.readyToDisplay = true;
           $scope.updateResults();
           $scope.loadingMessage = "";
           $scope.windowTitle = "Current GM Results";
         }
@@ skipping 722 matching lines @@
      */
     $scope.getImageDiffRelativeUrl = function(imagePair) {
       var before =
           imagePair[constants.KEY__IMAGEPAIRS__IMAGE_A_URL] + "-vs-" +
           imagePair[constants.KEY__IMAGEPAIRS__IMAGE_B_URL];
       return before.replace(/[^\w\-]/g, "_") + ".png";
     }
 
   }
 );