Modify rasterize_and_record for DisplayItemList recording.

tools/perf/measurements/rasterize_and_record_micro.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 sys
 import time
 
 from telemetry.core.util import TimeoutException
 from telemetry.page import page_test
 from telemetry.value import scalar
@@ skipping 65 matching lines @@
         results.current_page, 'pixels_recorded', 'pixels', pixels_recorded))
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'pixels_rasterized', 'pixels', pixels_rasterized))
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'rasterize_time', 'ms', rasterize_time))
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'viewport_picture_size', 'bytes',
         picture_memory_usage))
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'record_time', 'ms', record_time))
+
     record_time_sk_null_canvas = data['record_time_sk_null_canvas_ms']
     record_time_painting_disabled = data['record_time_painting_disabled_ms']
+    # TODO(schenney): Remove this workaround when reference builds get past
+    # the change that adds this comment.
+    if ('record_time_caching_disabled_ms' in data):
+      record_time_caching_disabled = data['record_time_caching_disabled_ms']
+    else:
+      record_time_caching_disabled = 0
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'record_time_sk_null_canvas', 'ms',
         record_time_sk_null_canvas))
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'record_time_painting_disabled', 'ms',
         record_time_painting_disabled))
+    results.AddValue(scalar.ScalarValue(
+        results.current_page, 'record_time_caching_disabled', 'ms',
+        record_time_caching_disabled))
 
     if self._report_detailed_results:
       pixels_rasterized_with_non_solid_color = \
           data['pixels_rasterized_with_non_solid_color']
       pixels_rasterized_as_opaque = \
           data['pixels_rasterized_as_opaque']
       total_layers = data['total_layers']
       total_picture_layers = data['total_picture_layers']
       total_picture_layers_with_no_content = \
           data['total_picture_layers_with_no_content']
@@ skipping 19 matching lines @@
           results.current_page, 'total_layers', 'count', total_layers))
       results.AddValue(scalar.ScalarValue(
           results.current_page, 'total_picture_layers', 'count',
           total_picture_layers))
       results.AddValue(scalar.ScalarValue(
           results.current_page, 'total_picture_layers_with_no_content', 'count',
           total_picture_layers_with_no_content))
       results.AddValue(scalar.ScalarValue(
           results.current_page, 'total_picture_layers_off_screen', 'count',
           total_picture_layers_off_screen))