Skia: Add --colorImages to DM

scripts/slave/recipe_modules/skia/api.py

 # Copyright 2014 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.
 
 
 import json
 import os
 import re
 import sys
 
@@ skipping 694 matching lines @@
         'patchset', self.m.properties['patchset'],
       ])
 
     args = [
       'dm',
       '--undefok',   # This helps branches that may not know new flags.
       '--resourcePath', self.device_dirs.resource_dir,
       '--skps', self.device_dirs.skp_dir,
       '--images', self.flavor.device_path_join(
           self.device_dirs.images_dir, 'dm'),
+      '--colorImages', self.flavor.device_path_join(
+          self.device_dirs.images_dir, 'colorspace'),

[borenet, 2016/05/04 12:09:55]

I have a couple of concerns:
1. This will break for backfills before this flag was added to DM.
2. Does DM properly handle this directory being missing? AFAICT it hasn't yet
been added to GS.

[scroggo, 2016/05/04 12:50:32]

Isn't this a more general problem any time we add a new flag to DM? Has this not
happened before? (I suppose we have not added any since we started backfilling?)
I believe CollectImages only causes a problem if a named directory/file is
missing/empty, but if no directories/files were listed, so not being there yet
should not be a problem.

[borenet, 2016/05/04 12:56:16]

Yeah, it's a general problem.  I just feel I need to point it out when it
happens and think briefly about whether there's any way to avoid it.  I think
"version >= 5" conditional would prevent any issues.

       '--nameByHash',
       '--properties'
     ] + properties
 
     args.append('--key')
     args.extend(self._KeyParams())
     if use_hash_file:
       args.extend(['--uninterestingHashesFile', hashes_file])
     if self.upload_dm_results:
       args.extend(['--writePath', self.device_dirs.dm_dir])
@@ skipping 163 matching lines @@
     # Don't bother to include role, which is always Test.
     # TryBots are uploaded elsewhere so they can use the same key.
     blacklist = ['role', 'is_trybot']
 
     flat = []
     for k in sorted(self.builder_cfg.keys()):
       if k not in blacklist:
         flat.append(k)
         flat.append(self.builder_cfg[k])
     return flat