| Index: tools/perf/benchmarks/page_cycler_v2.py
|
| diff --git a/tools/perf/benchmarks/page_cycler_v2.py b/tools/perf/benchmarks/page_cycler_v2.py
|
| index 0459c67540ef4b94a2330dac101194df9ecb87ac..49bbb48d4f3ce448fdd6085ec82ecaccb01f3f03 100644
|
| --- a/tools/perf/benchmarks/page_cycler_v2.py
|
| +++ b/tools/perf/benchmarks/page_cycler_v2.py
|
| @@ -17,32 +17,36 @@ from telemetry.timeline import chrome_trace_category_filter
|
| from telemetry.web_perf import timeline_based_measurement
|
|
|
|
|
| -class _PageCyclerV2(perf_benchmark.PerfBenchmark):
|
| - options = {'pageset_repeat': 2}
|
| +def TimelineBasedMeasurementOptionsForLoadingMetric():
|
| + cat_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter()
|
|
|
| - def CreateTimelineBasedMeasurementOptions(self):
|
| - cat_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter()
|
| + # "blink.console" is used for marking ranges in
|
| + # cache_temperature.MarkTelemetryInternal.
|
| + cat_filter.AddIncludedCategory('blink.console')
|
| +
|
| + # "navigation" and "blink.user_timing" are needed to capture core
|
| + # navigation events.
|
| + cat_filter.AddIncludedCategory('navigation')
|
| + cat_filter.AddIncludedCategory('blink.user_timing')
|
|
|
| - # "blink.console" is used for marking ranges in
|
| - # cache_temperature.MarkTelemetryInternal.
|
| - cat_filter.AddIncludedCategory('blink.console')
|
| + # "loading" is needed for first-meaningful-paint computation.
|
| + cat_filter.AddIncludedCategory('loading')
|
|
|
| - # "navigation" and "blink.user_timing" are needed to capture core
|
| - # navigation events.
|
| - cat_filter.AddIncludedCategory('navigation')
|
| - cat_filter.AddIncludedCategory('blink.user_timing')
|
| + # "toplevel" category is used to capture TaskQueueManager events
|
| + # necessary to compute time-to-interactive.
|
| + cat_filter.AddIncludedCategory('toplevel')
|
|
|
| - # "loading" is needed for first-meaningful-paint computation.
|
| - cat_filter.AddIncludedCategory('loading')
|
| + tbm_options = timeline_based_measurement.Options(
|
| + overhead_level=cat_filter)
|
| + tbm_options.SetTimelineBasedMetrics(['loadingMetric'])
|
| + return tbm_options
|
|
|
| - # "toplevel" category is used to capture TaskQueueManager events
|
| - # necessary to compute time-to-interactive.
|
| - cat_filter.AddIncludedCategory('toplevel')
|
|
|
| - tbm_options = timeline_based_measurement.Options(
|
| - overhead_level=cat_filter)
|
| - tbm_options.SetTimelineBasedMetrics(['loadingMetric'])
|
| - return tbm_options
|
| +class _PageCyclerV2(perf_benchmark.PerfBenchmark):
|
| + options = {'pageset_repeat': 2}
|
| +
|
| + def CreateTimelineBasedMeasurementOptions(self):
|
| + return TimelineBasedMeasurementOptionsForLoadingMetric()
|
|
|
| @classmethod
|
| def ShouldDisable(cls, possible_browser):
|
|
|