Added 'renderMode' and 'builder' as columns to the SKP front-end.

gm/rebaseline_server/imagediffdb.py

 #!/usr/bin/python
 
 """
 Copyright 2013 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
 Calulate differences between image pairs, and store them in a database.
 """
 
 # System-level imports
 import contextlib
 import errno
 import json
 import logging
 import os
 import Queue
 import re
 import shutil
 import tempfile
 import threading
 import time
 import urllib
 
 # Must fix up PYTHONPATH before importing from within Skia
-import fix_pythonpath  # pylint: disable=W0611
+import rs_fixpypath  # pylint: disable=W0611
 
 # Imports from within Skia
 import find_run_binary
 from py.utils import gs_utils
 
 
 SKPDIFF_BINARY = find_run_binary.find_path_to_program('skpdiff')
 
 DEFAULT_IMAGE_SUFFIX = '.png'
 DEFAULT_IMAGES_SUBDIR = 'images'
@@ skipping 430 matching lines @@
 
   Args:
     locator: string, or something that can be represented as a string.
         If None or '', it is returned without modification, because empty
         locators have a particular meaning ("there is no image for this")
   """
   if locator:
     return DISALLOWED_FILEPATH_CHAR_REGEX.sub('_', str(locator))
   else:
     return locator