| Index: tools/perf/benchmarks/page_cycler.py
|
| diff --git a/tools/perf/benchmarks/page_cycler.py b/tools/perf/benchmarks/page_cycler.py
|
| index a62424fc2e825dab80c3c9474b08fe91f67f3846..115fea1f0f2cc56a57ae8cf6c7d44d56ee7efc4f 100644
|
| --- a/tools/perf/benchmarks/page_cycler.py
|
| +++ b/tools/perf/benchmarks/page_cycler.py
|
| @@ -6,7 +6,6 @@ from core import perf_benchmark
|
|
|
| from measurements import page_cycler
|
| import page_sets
|
| -from telemetry import benchmark
|
|
|
|
|
| class _PageCycler(perf_benchmark.PerfBenchmark):
|
| @@ -34,8 +33,12 @@ class _PageCycler(perf_benchmark.PerfBenchmark):
|
| cold_load_percent=self.cold_load_percent,
|
| report_speed_index=options.report_speed_index)
|
|
|
| + @classmethod
|
| + def ShouldDisable(cls, possible_browser):
|
| + # Superseded by page_cycler_v2.py on all other platforms (crbug.com/611329).
|
| + return possible_browser.platform.GetOSName() != 'chromeos'
|
| +
|
|
|
| -@benchmark.Enabled('chromeos')
|
| class PageCyclerIntlArFaHe(_PageCycler):
|
| """Page load time for a variety of pages in Arabic, Farsi and Hebrew.
|
|
|
| @@ -48,7 +51,6 @@ class PageCyclerIntlArFaHe(_PageCycler):
|
| return 'page_cycler.intl_ar_fa_he'
|
|
|
|
|
| -@benchmark.Enabled('chromeos')
|
| class PageCyclerIntlEsFrPtBr(_PageCycler):
|
| """Page load time for a pages in Spanish, French and Brazilian Portuguese.
|
|
|
| @@ -73,7 +75,6 @@ class PageCyclerIntlHiRu(_PageCycler):
|
| return 'page_cycler.intl_hi_ru'
|
|
|
|
|
| -@benchmark.Enabled('chromeos')
|
| class PageCyclerIntlJaZh(_PageCycler):
|
| """Page load time benchmark for a variety of pages in Japanese and Chinese.
|
|
|
| @@ -107,16 +108,7 @@ class PageCyclerIntlKoThVi(_PageCycler):
|
| def Name(cls):
|
| return 'page_cycler.intl_ko_th_vi'
|
|
|
| - @classmethod
|
| - def ShouldDisable(cls, possible_browser):
|
| - # http://crbug.com/597656 (Android Nexus 5X).
|
| - # http://crbug.com/605543 (Mac Snow Leopard).
|
| - return (possible_browser.browser_type == 'reference' and (
|
| - possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X' or
|
| - possible_browser.platform.GetOSVersionName() == 'snowleopard'))
|
| -
|
|
|
| -@benchmark.Disabled('android') # crbug.com/357326
|
| class PageCyclerToughLayoutCases(_PageCycler):
|
| """Page loading for the slowest layouts observed in the Alexa top 1 million.
|
|
|
| @@ -138,17 +130,6 @@ class PageCyclerTypical25(_PageCycler):
|
| options = {'pageset_repeat': 3}
|
|
|
| @classmethod
|
| - def ShouldDisable(cls, possible_browser):
|
| - if possible_browser.browser_type == 'reference':
|
| - if possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X':
|
| - return True # http://crbug.com/597656
|
| - if possible_browser.platform.GetOSVersionName() == 'yosemite':
|
| - return True # http://crbug.com/634337
|
| - if possible_browser.platform.GetDeviceTypeName() == 'AOSP on BullHead':
|
| - return True # http://crbug.com/616781
|
| - return False
|
| -
|
| - @classmethod
|
| def Name(cls):
|
| return 'page_cycler.typical_25'
|
|
|
| @@ -156,7 +137,6 @@ class PageCyclerTypical25(_PageCycler):
|
| return page_sets.Typical25PageSet(run_no_page_interactions=True)
|
|
|
|
|
| -@benchmark.Disabled('reference', 'android')
|
| class PageCyclerBasicOopifIsolated(_PageCycler):
|
| """ A benchmark measuring performance of out-of-process iframes. """
|
| page_set = page_sets.OopifBasicPageSet
|
| @@ -177,7 +157,3 @@ class PageCyclerBasicOopif(_PageCycler):
|
| @classmethod
|
| def Name(cls):
|
| return 'page_cycler.basic_oopif'
|
| -
|
| - @classmethod
|
| - def ShouldDisable(cls, possible_browser):
|
| - return cls.IsSvelte(possible_browser) # http://crbug.com/607657
|
|
|