| Index: tools/perf/benchmarks/smoothness.py
|
| diff --git a/tools/perf/benchmarks/smoothness.py b/tools/perf/benchmarks/smoothness.py
|
| index f4fa52dda3fe66680f994edd9417ca7b539e4b88..ae14633f5f1fe66770a4eccd26cd1daca79bd42c 100644
|
| --- a/tools/perf/benchmarks/smoothness.py
|
| +++ b/tools/perf/benchmarks/smoothness.py
|
| @@ -2,9 +2,11 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| +from telemetry import test
|
| +
|
| from benchmarks import silk_flags
|
| from measurements import smoothness
|
| -from telemetry import test
|
| +import page_sets
|
|
|
|
|
| class SmoothnessTop25(test.Test):
|
| @@ -12,23 +14,23 @@ class SmoothnessTop25(test.Test):
|
|
|
| http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/top_25.py'
|
| + page_set = page_sets.Top25PageSet
|
|
|
|
|
| @test.Disabled('mac')
|
| class SmoothnessToughCanvasCases(test.Test):
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/tough_canvas_cases.py'
|
| + page_set = page_sets.ToughCanvasCasesPageSet
|
|
|
|
|
| class SmoothnessToughWebGLCases(test.Test):
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/tough_webgl_cases.py'
|
| + page_set = page_sets.ToughWebglCasesPageSet
|
|
|
|
|
| class SmoothnessMaps(test.Test):
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/maps.py'
|
| + page_set = page_sets.MapsPageSet
|
|
|
|
|
| class SmoothnessKeyMobileSites(test.Test):
|
| @@ -36,13 +38,13 @@ class SmoothnessKeyMobileSites(test.Test):
|
|
|
| http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/key_mobile_sites.py'
|
| + page_set = page_sets.KeyMobileSitesPageSet
|
|
|
|
|
| @test.Disabled('android') # crbug.com/350692
|
| class SmoothnessToughAnimationCases(test.Test):
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/tough_animation_cases.py'
|
| + page_set = page_sets.ToughAnimationCasesPageSet
|
|
|
|
|
| class SmoothnessKeySilkCases(test.Test):
|
| @@ -50,7 +52,7 @@ class SmoothnessKeySilkCases(test.Test):
|
| rasterization
|
| """
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/key_silk_cases.py'
|
| + page_set = page_sets.KeySilkCasesPageSet
|
|
|
|
|
| class SmoothnessFastPathKeySilkCases(test.Test):
|
| @@ -59,7 +61,7 @@ class SmoothnessFastPathKeySilkCases(test.Test):
|
| """
|
| tag = 'fast_path'
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/key_silk_cases.py'
|
| + page_set = page_sets.KeySilkCasesPageSet
|
| def CustomizeBrowserOptions(self, options):
|
| silk_flags.CustomizeBrowserOptionsForFastPath(options)
|
|
|
| @@ -69,7 +71,7 @@ class SmoothnessGpuRasterizationTop25(test.Test):
|
| """
|
| tag = 'gpu_rasterization'
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/top_25.py'
|
| + page_set = page_sets.Top25PageSet
|
| def CustomizeBrowserOptions(self, options):
|
| silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
|
|
|
| @@ -80,7 +82,7 @@ class SmoothnessGpuRasterizationKeyMobileSites(test.Test):
|
| """
|
| tag = 'gpu_rasterization'
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/key_mobile_sites.py'
|
| + page_set = page_sets.KeyMobileSitesPageSet
|
| def CustomizeBrowserOptions(self, options):
|
| silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
|
|
|
| @@ -90,7 +92,7 @@ class SmoothnessGpuRasterizationKeySilkCases(test.Test):
|
| """
|
| tag = 'gpu_rasterization'
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/key_silk_cases.py'
|
| + page_set = page_sets.KeySilkCasesPageSet
|
| def CustomizeBrowserOptions(self, options):
|
| silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
|
|
|
| @@ -102,7 +104,7 @@ class SmoothnessFastPathGpuRasterizationKeySilkCases(
|
| """
|
| tag = 'fast_path_gpu_rasterization'
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/key_silk_cases.py'
|
| + page_set = page_sets.KeySilkCasesPageSet
|
| def CustomizeBrowserOptions(self, options):
|
| super(SmoothnessFastPathGpuRasterizationKeySilkCases, self). \
|
| CustomizeBrowserOptions(options)
|
| @@ -115,7 +117,7 @@ class SmoothnessToughPinchZoomCases(test.Test):
|
| cases
|
| """
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/tough_pinch_zoom_cases.py'
|
| + page_set = page_sets.ToughPinchZoomCasesPageSet
|
|
|
|
|
| @test.Enabled('android')
|
| @@ -123,7 +125,7 @@ class SmoothnessPolymer(test.Test):
|
| """Measures rendering statistics for Polymer cases.
|
| """
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/polymer.py'
|
| + page_set = page_sets.PolymerPageSet
|
|
|
|
|
| @test.Enabled('android')
|
| @@ -133,7 +135,7 @@ class SmoothnessFastPathPolymer(test.Test):
|
| """
|
| tag = 'fast_path'
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/polymer.py'
|
| + page_set = page_sets.PolymerPageSet
|
| def CustomizeBrowserOptions(self, options):
|
| silk_flags.CustomizeBrowserOptionsForFastPath(options)
|
|
|
| @@ -144,7 +146,7 @@ class SmoothnessGpuRasterizationPolymer(test.Test):
|
| """
|
| tag = 'gpu_rasterization'
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/polymer.py'
|
| + page_set = page_sets.PolymerPageSet
|
| def CustomizeBrowserOptions(self, options):
|
| silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
|
|
|
| @@ -157,7 +159,7 @@ class SmoothnessFastPathGpuRasterizationPolymer(
|
| """
|
| tag = 'fast_path_gpu_rasterization'
|
| test = smoothness.Smoothness
|
| - page_set = 'page_sets/polymer.py'
|
| + page_set = page_sets.PolymerPageSet
|
| def CustomizeBrowserOptions(self, options):
|
| super(SmoothnessFastPathGpuRasterizationPolymer, self). \
|
| CustomizeBrowserOptions(options)
|
|
|