Add viewport CPU and GPU bench_pictures configs

tools/bench_pictures.cfg

Index: tools/bench_pictures.cfg
===================================================================
--- tools/bench_pictures.cfg	(revision 11152)
+++ tools/bench_pictures.cfg	(working copy)
@@ -31,13 +31,20 @@
 DEFAULT_TILE_X = '256'
 DEFAULT_TILE_Y = '256'
 
+# Default viewport size
+DEFAULT_VIEWPORT_X = 1500
+DEFAULT_VIEWPORT_Y = 1000
 
+
 # Configs to run on most bots
 default_configs = [
   # Basic CPU and GPU configs
   TiledBitmapConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y),
-  TiledGPUConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y),
 
+  # Viewport CPU and GPU
+  ViewportBitmapConfig(DEFAULT_VIEWPORT_X, DEFAULT_VIEWPORT_Y)
+  ViewportGPUConfig(DEFAULT_VIEWPORT_X, DEFAULT_VIEWPORT_Y)
+
   # CopyTiles
   CopyTilesConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y),
 
@@ -84,7 +91,6 @@
   ]
 
   if do_gpu:
-    configs.append(TiledGPUConfig(tile_x, tile_y, scale=str(scale)))
     configs.append(ViewportGPUConfig(viewport_x, viewport_y, scale=str(scale)))
 
   # Multicore