cc: Add rasterize and record micro benchmark.

tools/perf/measurements/new_rasterize_and_record.py

 # Copyright 2013 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.
 
 import time
 
-from metrics import smoothness
 from telemetry.page import page_measurement
 
-class RecordPerArea(page_measurement.PageMeasurement):
+class NewRasterizeAndRecord(page_measurement.PageMeasurement):
   def __init__(self):
-    super(RecordPerArea, self).__init__('', True)
+    super(NewRasterizeAndRecord, self).__init__('', True)
 
   def AddCommandLineOptions(self, parser):
     parser.add_option('--start-wait-time', dest='start_wait_time',
-                      default=2,
+                      default=10,
                       help='Wait time before the benchmark is started ' +
                       '(must be long enought to load all content)')
 
   def CustomizeBrowserOptions(self, options):
-    smoothness.SmoothnessMetrics.CustomizeBrowserOptions(options)
     options.AppendExtraBrowserArgs([
         '--enable-impl-side-painting',
         '--force-compositing-mode',
         '--enable-threaded-compositing',
         '--enable-gpu-benchmarking'
     ])
 
   def MeasurePage(self, page, tab, results):
     # Wait until the page has loaded and come to a somewhat steady state.
     # Needs to be adjusted for every device (~2 seconds for workstation).
     time.sleep(float(self.options.start_wait_time))
 
     # Enqueue benchmark
     tab.ExecuteJavaScript("""
         window.benchmark_results = {};
         window.benchmark_results.done = false;
         chrome.gpuBenchmarking.runMicroBenchmark(
-            "picture_record_benchmark",
+            "rasterize_and_record_benchmark",
             function(value) {
               window.benchmark_results.done = true;
               window.benchmark_results.results = value;
-            }, [{width: 1, height: 1},
-                {width: 250, height: 250},
-                {width: 500, height: 500},
-                {width: 750, height: 750},
-                {width: 1000, height: 1000},
-                {width: 256, height: 1024},
-                {width: 1024, height: 256}]);
+            }, {
+              "record_repeat_count": 1000,
+              "rasterize_repeat_count": 1000
+            });
     """)
 
     tab.WaitForJavaScriptExpression('window.benchmark_results.done', 300)
 
-    all_data = tab.EvaluateJavaScript('window.benchmark_results.results')
-    for data in all_data:
-      width = data['width']
-      height = data['height']
-      area = width * height
-      time_ms = data['time_ms']
+    data = tab.EvaluateJavaScript('window.benchmark_results.results')
 
-      results.Add('area_%07d_%dx%d' % (area, width, height), 'ms', time_ms)
+    pixels_recorded = data['pixels_recorded']
+    record_time = data['record_time_ms']
+    pixels_rasterized = data['pixels_rasterized']
+    rasterize_time = data['rasterize_time_ms']
 
+    results.Add('pixels_recorded', '', pixels_recorded)
+    results.Add('record_time', 'ms', record_time)
+    results.Add('pixels_rasterized', '', pixels_rasterized)
+    results.Add('rasterize_time', 'ms', rasterize_time)
+