Add viewport CPU and GPU bench_pictures configs

tools/bench_pictures.cfg

 # Copyright (c) 2012 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.
 
 
 """
 This file defines the configurations in which bench_pictures should be run
 on various platforms. The buildbots read these configurations from the
 bench_pictures_cfg dictionary. Everything else in this file exists to help in
 constructing that dictionary.
@@ skipping 13 matching lines @@
   sys.path.append(import_path)
 
 
 from bench_pictures_cfg_helper import *
 
 
 # Default tile sizes
 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),
 
   # Record
   RecordConfig(),
 
   # Multi-threaded
   MultiThreadTileConfig(4, DEFAULT_TILE_X, DEFAULT_TILE_Y),
 
@@ skipping 27 matching lines @@
     TiledBitmapConfig(tile_x, tile_y, scale=str(scale)),
     TileRTreeConfig(  tile_x, tile_y, scale=str(scale)),
     TileGridConfig(   tile_x, tile_y, scale=str(scale)),
 
     # Viewport playback
     ViewportBitmapConfig(viewport_x, viewport_y, scale=str(scale)),
     ViewportRTreeConfig( viewport_x, viewport_y, scale=str(scale)),
   ]
 
   if do_gpu:
-    configs.append(TiledGPUConfig(tile_x, tile_y, scale=str(scale)))
     configs.append(ViewportGPUConfig(viewport_x, viewport_y, scale=str(scale)))
 
   # Multicore
   for num_cores in cores:
     configs.append(MultiThreadTileConfig(num_cores, tile_x, tile_y,
                                          scale=str(scale)))
 
   return configs
 
 
@@ skipping 14 matching lines @@
   '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, [4], (1280, 800)),
   'nexus_10':     AndroidConfigList((512, 512), 2.6122, [],  (2560, 1600),
                                     do_gpu=False) + [msaa4],
   'razr_i':       AndroidConfigList((256, 256), 0.5510, [],  (540, 960)) + \
                       [msaa4],
   'intel_rhb':    AndroidConfigList((256, 256), 0.5510, [],  (540, 960)) + \
                       [msaa4],
 }