Index: tools/perf/benchmarks/gpu_times.py |
diff --git a/tools/perf/benchmarks/gpu_times.py b/tools/perf/benchmarks/gpu_times.py |
index 13915bbd969858627eb36919bfbc59409b19242f..374a0cc0dee9f762a2284d036c11eefcdfd74dc2 100644 |
--- a/tools/perf/benchmarks/gpu_times.py |
+++ b/tools/perf/benchmarks/gpu_times.py |
@@ -26,8 +26,12 @@ class _GPUTimes(benchmark.Benchmark): |
overhead_level=cat_filter, |
get_metrics_from_flags_callback=_GetGPUTimelineMetric) |
+ @classmethod |
+ def ValueCanBeAddedPredicate(cls, value): |
+ return (isinstance(value, gpu_timeline.GPUTimelineListOfValues) or |
+ isinstance(value, gpu_timeline.GPUTimelineValue)) |
+ |
-@benchmark.Disabled # http://crbug.com/455292 |
class GPUTimesKeyMobileSites(_GPUTimes): |
"""Measures GPU timeline metric on key mobile sites.""" |
page_set = page_sets.KeyMobileSitesSmoothPageSet |
@@ -36,7 +40,7 @@ class GPUTimesKeyMobileSites(_GPUTimes): |
def Name(cls): |
return 'gpu_times.key_mobile_sites_smooth' |
-@benchmark.Disabled # http://crbug.com/455292 |
+ |
class GPUTimesGpuRasterizationKeyMobileSites(_GPUTimes): |
"""Measures GPU timeline metric on key mobile sites with GPU rasterization. |
""" |
@@ -48,7 +52,7 @@ class GPUTimesGpuRasterizationKeyMobileSites(_GPUTimes): |
def Name(cls): |
return 'gpu_times.gpu_rasterization.key_mobile_sites_smooth' |
-@benchmark.Disabled # http://crbug.com/453131, http://crbug.com/455292 |
+ |
class GPUTimesTop25Sites(_GPUTimes): |
"""Measures GPU timeline metric for the top 25 sites.""" |
page_set = page_sets.Top25SmoothPageSet |
@@ -57,7 +61,7 @@ class GPUTimesTop25Sites(_GPUTimes): |
def Name(cls): |
return 'gpu_times.top_25_smooth' |
-@benchmark.Disabled # http://crbug.com/455292 |
+ |
class GPUTimesGpuRasterizationTop25Sites(_GPUTimes): |
"""Measures GPU timeline metric for the top 25 sites with GPU rasterization. |
""" |