Index: tools/perf/benchmarks/repaint.py |
diff --git a/tools/perf/benchmarks/repaint.py b/tools/perf/benchmarks/repaint.py |
index 52270c1c8b27a11bbb0ab8fc1ff1faddc4110d67..3e1852cc9ac9e5d7620a97054f8c95673980d5a4 100644 |
--- a/tools/perf/benchmarks/repaint.py |
+++ b/tools/perf/benchmarks/repaint.py |
@@ -4,7 +4,6 @@ |
from core import perf_benchmark |
-from benchmarks import silk_flags |
import ct_benchmarks_util |
from measurements import smoothness |
@@ -13,8 +12,15 @@ from page_sets import repaint_helpers |
from telemetry import benchmark |
+# Disabled because we do not plan on running CT benchmarks on the perf |
+# waterfall any time soon. |
+@benchmark.Disabled('all') |
+class RepaintCT(perf_benchmark.PerfBenchmark): |
+ """Measures repaint performance for Cluster Telemetry.""" |
-class _Repaint(perf_benchmark.PerfBenchmark): |
+ @classmethod |
+ def Name(cls): |
+ return 'repaint_ct' |
@classmethod |
def AddBenchmarkCommandLineArgs(cls, parser): |
@@ -28,66 +34,6 @@ class _Repaint(perf_benchmark.PerfBenchmark): |
parser.add_option('--height', type='int', |
default=None, |
help='Height of invalidations for fixed_size mode.') |
- |
- @classmethod |
- def Name(cls): |
- return 'repaint' |
- |
- def CreateStorySet(self, options): |
- return page_sets.KeyMobileSitesRepaintPageSet( |
- options.mode, options.width, options.height) |
- |
- def CreatePageTest(self, options): |
- return smoothness.Repaint() |
- |
-# crbug.com/499320 |
-#@benchmark.Enabled('android') |
- |
- |
-@benchmark.Disabled('all') |
-@benchmark.Owner(emails=['wkorman@chromium.org', 'vmpstr@chromium.org']) |
-class RepaintKeyMobileSites(_Repaint): |
- """Measures repaint performance on the key mobile sites. |
- |
- http://www.chromium.org/developers/design-documents/rendering-benchmarks""" |
- |
- @classmethod |
- def Name(cls): |
- return 'repaint.key_mobile_sites_repaint' |
- |
- |
-# crbug.com/502179 |
-@benchmark.Enabled('android') |
-@benchmark.Disabled('all') |
-@benchmark.Owner(emails=['wkorman@chromium.org', 'vmpstr@chromium.org']) |
-class RepaintGpuRasterizationKeyMobileSites(_Repaint): |
- """Measures repaint performance on the key mobile sites with forced GPU |
- rasterization. |
- |
- http://www.chromium.org/developers/design-documents/rendering-benchmarks""" |
- tag = 'gpu_rasterization' |
- |
- def SetExtraBrowserOptions(self, options): |
- silk_flags.CustomizeBrowserOptionsForGpuRasterization(options) |
- |
- @classmethod |
- def Name(cls): |
- return 'repaint.gpu_rasterization.key_mobile_sites_repaint' |
- |
- |
-# Disabled because we do not plan on running CT benchmarks on the perf |
-# waterfall any time soon. |
-@benchmark.Disabled('all') |
-class RepaintCT(_Repaint): |
- """Measures repaint performance for Cluster Telemetry.""" |
- |
- @classmethod |
- def Name(cls): |
- return 'repaint_ct' |
- |
- @classmethod |
- def AddBenchmarkCommandLineArgs(cls, parser): |
- _Repaint.AddBenchmarkCommandLineArgs(parser) |
ct_benchmarks_util.AddBenchmarkCommandLineArgs(parser) |
@classmethod |
@@ -98,3 +44,6 @@ class RepaintCT(_Repaint): |
return page_sets.CTPageSet( |
options.urls_list, options.user_agent, options.archive_data_file, |
run_page_interaction_callback=repaint_helpers.WaitThenRepaint) |
+ |
+ def CreatePageTest(self, options): |
+ return smoothness.Repaint() |