Index: tools/perf/measurements/rasterize_and_record.py |
diff --git a/tools/perf/measurements/rasterize_and_record.py b/tools/perf/measurements/rasterize_and_record.py |
index fbd9752d4de5586b4f712b8ec237d90943f42124..f875d2b27cc90bfb983837ac27dd4f9001c1ae77 100644 |
--- a/tools/perf/measurements/rasterize_and_record.py |
+++ b/tools/perf/measurements/rasterize_and_record.py |
@@ -11,6 +11,8 @@ from telemetry.page import page_measurement |
from telemetry.core.timeline.model import MarkerMismatchError |
from telemetry.core.timeline.model import MarkerOverlapError |
+TIMELINE_MARKER = 'RasterizeAndRecord' |
+ |
class RasterizeAndRecord(page_measurement.PageMeasurement): |
def __init__(self): |
@@ -97,7 +99,7 @@ class RasterizeAndRecord(page_measurement.PageMeasurement): |
'window.__rafFired = false;' |
'window.webkitRequestAnimationFrame(function() {' |
'chrome.gpuBenchmarking.setNeedsDisplayOnAllLayers();' |
- 'console.time("' + rendering_stats.RENDER_PROCESS_MARKER + '");' |
+ 'console.time("' + TIMELINE_MARKER + '");' |
'window.__rafFired = true;' |
'});') |
# Wait until the frame was drawn. |
@@ -106,15 +108,15 @@ class RasterizeAndRecord(page_measurement.PageMeasurement): |
# TODO(ernstm): replace by call-back. |
time.sleep(float(self.options.stop_wait_time)) |
tab.ExecuteJavaScript( |
- 'console.timeEnd("' + rendering_stats.RENDER_PROCESS_MARKER + '")') |
+ 'console.timeEnd("' + TIMELINE_MARKER + '")') |
timeline = tab.browser.StopTracing().AsTimelineModel() |
try: |
- timeline_markers = timeline.FindTimelineMarkers( |
- rendering_stats.RENDER_PROCESS_MARKER) |
+ timeline_markers = timeline.FindTimelineMarkers(TIMELINE_MARKER) |
except (MarkerMismatchError, MarkerOverlapError) as e: |
raise page_measurement.MeasurementFailure(str(e)) |
- stats = rendering_stats.RenderingStats(timeline_markers, timeline_markers) |
+ renderer_process = timeline.GetRendererProcessFromTab(tab) |
+ stats = rendering_stats.RenderingStats(renderer_process, timeline_markers) |
results.Add('rasterize_time', 'ms', |
max(stats.rasterize_time)) |