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
diff --git a/tools/bench_pictures_cfg_helper.py b/tools/bench_pictures_cfg_helper.py
index 654bad6..3d6b3c0 100644
--- a/tools/bench_pictures_cfg_helper.py
+++ b/tools/bench_pictures_cfg_helper.py
@@ -38,8 +38,8 @@
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 @@
**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 @@
**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):