Enable per-tile logging in bench_pictures

- Modify bench_pictures buildstep to translate "key: True" --> "--key" rather
  than requiring "key: value" --> "--key value"
- Add whacky TileArgs helper which includes "timeIndividualTiles: True"
Review URL: https://codereview.appspot.com/7092046

git-svn-id: http://skia.googlecode.com/svn/trunk@7141 2bbb7eff-a529-9590-31e7-b0007b416f81

tools/bench_pictures_cfg_helper.py

@@ -13,6 +13,11 @@ def Config(**kwargs):
   return config
 
 
+def TileArgs(tile_x, tile_y):
+  return {'mode': ['tile', str(tile_x), str(tile_y)],
+          'timeIndividualTiles': True}
+
+
 def BitmapConfig(**kwargs):
   return Config(device='bitmap', **kwargs)
 
@@ -22,11 +27,11 @@ def GPUConfig(**kwargs):
 
 
 def TiledBitmapConfig(tile_x, tile_y, **kwargs):
-  return BitmapConfig(mode=['tile', str(tile_x), str(tile_y)], **kwargs)
+  return BitmapConfig(**dict(TileArgs(tile_x, tile_y).items() + kwargs.items()))
 
 
 def TiledGPUConfig(tile_x, tile_y, **kwargs):
-  return GPUConfig(mode=['tile', str(tile_x), str(tile_y)], **kwargs)
+  return GPUConfig(**dict(TileArgs(tile_x, tile_y).items() + kwargs.items()))
 
 
 def ViewportBitmapConfig(viewport_x, viewport_y, **kwargs):
@@ -82,7 +87,7 @@ def PlaybackCreationRTreeConfig(**kwargs):
 
 
 def TileRTreeConfig(tile_x, tile_y, **kwargs):
-  return RTreeConfig(mode=['tile', str(tile_x), str(tile_y)], **kwargs)
+  return RTreeConfig(**dict(TileArgs(tile_x, tile_y).items() + kwargs.items()))
 
 
 def RecordGridConfig(tile_x, tile_y, **kwargs):
@@ -94,5 +99,5 @@ def PlaybackCreationGridConfig(tile_x, tile_y, **kwargs):
 
 
 def TileGridConfig(tile_x, tile_y, **kwargs):
-  return GridConfig(tile_x, tile_y, mode=['tile', str(tile_x), str(tile_y)],
-                    **kwargs)
+  return GridConfig(tile_x, tile_y,
+                    **dict(TileArgs(tile_x, tile_y).items() + kwargs.items()))

tools/tests/bench_pictures_cfg_test.py

@@ -39,7 +39,7 @@ def Main(argv):
         if type(value).__name__ == 'list':
           for item in value:
             ThrowIfNotAString(item)
-        else:
+        elif not value is True:
           ThrowIfNotAString(value)
 
 if __name__ == '__main__':