Chromium Code Reviews| Index: tools/perf/benchmarks/blink_perf.py |
| diff --git a/tools/perf/benchmarks/blink_perf.py b/tools/perf/benchmarks/blink_perf.py |
| index 20d3a025ebceeb4bfbb020b69684339d4fe674d4..0aaba874e185eb11d10a2ed727cf3371702bb4da 100644 |
| --- a/tools/perf/benchmarks/blink_perf.py |
| +++ b/tools/perf/benchmarks/blink_perf.py |
| @@ -97,6 +97,23 @@ class _BlinkPerfMeasurement(page_test.PageTest): |
| print log |
| +class _BlinkPerfFullLayoutMeasurement(_BlinkPerfMeasurement): |
| + def __init__(self): |
| + super(_BlinkPerfFullLayoutMeasurement, self).__init__() |
| + self._blink_perf_js += '\nwindow.fullLayoutMeasurement = true;' |
| + |
| + def CustomizeBrowserOptions(self, options): |
| + super(_BlinkPerfFullLayoutMeasurement, self).CustomizeBrowserOptions( |
| + options) |
| + |
| + # Full layout measurement needs content_shell with internals testing API. |
| + if options.browser_type == 'release': |
| + options.browser_type = 'content-shell-release' |
| + elif options.browser_type == 'debug': |
| + options.browser_type = 'content-shell-debug' |
|
Xianzhu
2014/10/29 16:54:58
Here browser_type is still forced, but it is for t
|
| + options.AppendExtraBrowserArgs(['--expose-internals-for-testing']) |
| + |
| + |
| class BlinkPerfAnimation(benchmark.Benchmark): |
| tag = 'animation' |
| test = _BlinkPerfMeasurement |
| @@ -169,6 +186,11 @@ class BlinkPerfLayout(benchmark.Benchmark): |
| return _CreatePageSetFromPath(path, SKIPPED_FILE) |
| +class BlinkPerfLayoutFullLayout(BlinkPerfLayout): |
| + tag = 'layout_full_layout' |
| + test = _BlinkPerfFullLayoutMeasurement |
| + |
| + |
| class BlinkPerfMutation(benchmark.Benchmark): |
| tag = 'mutation' |
| test = _BlinkPerfMeasurement |
| @@ -196,6 +218,11 @@ class BlinkPerfSVG(benchmark.Benchmark): |
| return _CreatePageSetFromPath(path, SKIPPED_FILE) |
| +class BlinkPerfSVGFullLayout(BlinkPerfSVG): |
| + tag = 'svg_full_layout' |
| + test = _BlinkPerfFullLayoutMeasurement |
| + |
| + |
| class BlinkPerfShadowDOM(benchmark.Benchmark): |
| tag = 'shadow_dom' |
| test = _BlinkPerfMeasurement |