Tweak Android bench_pictures configs

Review URL: https://codereview.appspot.com/6970044

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

2 files changed, 20 insertions, 24 deletions

diff --git a/tools/bench_pictures.cfg b/tools/bench_pictures.cfg
index c64a686640..661af52850 100644
--- a/tools/bench_pictures.cfg
+++ b/tools/bench_pictures.cfg
@@ -55,11 +55,11 @@ default_configs = [
   TiledBitmapConfig(1024, 64),
 
   # Different bounding box heirarchies, for different modes.
-  RecordRTreeConfig(          DEFAULT_TILE_X, DEFAULT_TILE_Y),
+  RecordRTreeConfig(),
+  PlaybackCreationRTreeConfig(),
+  TileRTreeConfig(            DEFAULT_TILE_X, DEFAULT_TILE_Y),
   RecordGridConfig(           DEFAULT_TILE_X, DEFAULT_TILE_Y),
-  PlaybackCreationRTreeConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y),
   PlaybackCreationGridConfig( DEFAULT_TILE_X, DEFAULT_TILE_Y),
-  TileRTreeConfig(            DEFAULT_TILE_X, DEFAULT_TILE_Y),
   TileGridConfig(             DEFAULT_TILE_X, DEFAULT_TILE_Y),
 ]
 
@@ -73,8 +73,8 @@ def AndroidConfigList(tile_size, scale, cores, viewport, do_gpu=True):
 
   configs = [
     # Record
-    RecordConfig(scale=str(scale)),
-    RecordRTreeConfig(tile_x, tile_y, scale=str(scale)),
+    RecordConfig(     scale=str(scale)),
+    RecordRTreeConfig(scale=str(scale)),
     RecordGridConfig( tile_x, tile_y, scale=str(scale)),
 
     # Tiled playback
@@ -85,7 +85,6 @@ def AndroidConfigList(tile_size, scale, cores, viewport, do_gpu=True):
     # Viewport playback
     ViewportBitmapConfig(viewport_x, viewport_y, scale=str(scale)),
     ViewportRTreeConfig( viewport_x, viewport_y, scale=str(scale)),
-    ViewportGridConfig(  viewport_x, viewport_y, scale=str(scale)),
   ]
 
   if do_gpu:
@@ -107,11 +106,11 @@ bench_pictures_cfg = {
   'debug': [TiledBitmapConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y)],
   'default': default_configs,
   'no_gpu': [cfg for cfg in default_configs if cfg['device'] != 'gpu'],
-  'nexus_s':      AndroidConfigList((256, 256), 0.4897, [],  (800,  480),
+  'nexus_s':      AndroidConfigList((256, 256), 0.4897, [],  (480,  800),
                                     do_gpu=False),
-  'nexus_4':      AndroidConfigList((256, 256), 0.8163, [],  (1280, 768)),
-  'nexus_7':      AndroidConfigList((256, 256), 0.8163, [2], (1280, 800)),
-  'nexus_10':     AndroidConfigList((512, 512), 1.6326, [],  (2560, 1600)),
-  'galaxy_nexus': AndroidConfigList((256, 256), 0.8163, [],  (1280, 800)),
-  'xoom':         AndroidConfigList((256, 256), 0.8163, [],  (1200, 800)),
+  'xoom':         AndroidConfigList((256, 256), 1.2244, [],  (1200, 800)),
+  'galaxy_nexus': AndroidConfigList((256, 256), 0.8163, [],  (800,  1280)),
+  'nexus_4':      AndroidConfigList((256, 256), 0.7836, [],  (768,  1280)),
+  'nexus_7':      AndroidConfigList((256, 256), 1.3061, [2], (1280, 800)),
+  'nexus_10':     AndroidConfigList((512, 512), 2.6122, [],  (2560, 1600)),
 }
\ No newline at end of file
diff --git a/tools/bench_pictures_cfg_helper.py b/tools/bench_pictures_cfg_helper.py
index 654bad6e66..3d6b3c0a28 100644
--- a/tools/bench_pictures_cfg_helper.py
+++ b/tools/bench_pictures_cfg_helper.py
@@ -38,8 +38,8 @@ def ViewportGPUConfig(viewport_x, viewport_y, **kwargs):
 
 
 def ViewportRTreeConfig(viewport_x, viewport_y, **kwargs):
-  return RTreeConfig(viewport_x, viewport_y, mode='simple',
-                     viewport=[str(viewport_x), str(viewport_y)], **kwargs)
+  return RTreeConfig(mode='simple', viewport=[str(viewport_x), str(viewport_y)],
+                     **kwargs)
 
 
 def ViewportGridConfig(viewport_x, viewport_y, **kwargs):
@@ -64,9 +64,8 @@ def MultiThreadTileConfig(threads, tile_x, tile_y, **kwargs):
                            **kwargs)
 
 
-def RTreeConfig(tile_x, tile_y, mode, **kwargs):
-  return BitmapConfig(mode=mode, bbh=['rtree', str(tile_x), str(tile_y)],
-                      **kwargs)
+def RTreeConfig(**kwargs):
+  return BitmapConfig(bbh='rtree', **kwargs)
 
 
 def GridConfig(tile_x, tile_y, mode, **kwargs):
@@ -74,18 +73,16 @@ def GridConfig(tile_x, tile_y, mode, **kwargs):
                       **kwargs)
 
 
-def RecordRTreeConfig(tile_x, tile_y, **kwargs):
-  return RTreeConfig(tile_x=tile_x, tile_y=tile_y, mode='record', **kwargs)
+def RecordRTreeConfig(**kwargs):
+  return RTreeConfig(mode='record', **kwargs)
 
 
-def PlaybackCreationRTreeConfig(tile_x, tile_y, **kwargs):
-  return RTreeConfig(tile_x=tile_x, tile_y=tile_y, mode='playbackCreation',
-                     **kwargs)
+def PlaybackCreationRTreeConfig(**kwargs):
+  return RTreeConfig(mode='playbackCreation', **kwargs)
 
 
 def TileRTreeConfig(tile_x, tile_y, **kwargs):
-  return RTreeConfig(tile_x=tile_x, tile_y=tile_y,
-                     mode=['tile', str(tile_x), str(tile_y)], **kwargs)
+  return RTreeConfig(mode=['tile', str(tile_x), str(tile_y)], **kwargs)
 
 
 def RecordGridConfig(tile_x, tile_y, **kwargs):