| Index: tools/perf/measurements/page_cycler.py
|
| diff --git a/tools/perf/measurements/page_cycler.py b/tools/perf/measurements/page_cycler.py
|
| index 5ea989796bd2b004bf75a62ca6007f4d016e5bf4..22dbdb47512202fb0830dc80a60177b91cf9ec21 100644
|
| --- a/tools/perf/measurements/page_cycler.py
|
| +++ b/tools/perf/measurements/page_cycler.py
|
| @@ -20,6 +20,7 @@ import sys
|
|
|
| from metrics import histogram
|
| from metrics import memory
|
| +from metrics import network
|
| from telemetry.core import util
|
| from telemetry.page import page_measurement
|
|
|
| @@ -40,6 +41,7 @@ class PageCycler(page_measurement.PageMeasurement):
|
|
|
| self._memory_metric = None
|
| self._histograms = None
|
| + self._network_metric = network.NetworkMetric()
|
|
|
| def AddCommandLineOptions(self, parser):
|
| # The page cyclers should default to 10 iterations. In order to change the
|
| @@ -65,6 +67,7 @@ class PageCycler(page_measurement.PageMeasurement):
|
|
|
| def WillNavigateToPage(self, page, tab):
|
| page.script_to_evaluate_on_commit = self._page_cycler_js
|
| + self._network_metric.Start(page, tab)
|
|
|
| def DidNavigateToPage(self, page, tab):
|
| for h in self._histograms:
|
| @@ -78,6 +81,11 @@ class PageCycler(page_measurement.PageMeasurement):
|
| # Old commandline flags used for reference builds.
|
| options.AppendExtraBrowserArg('--dom-automation')
|
|
|
| + # TODO(tonyg): NetworkMetric should be responsible for setting these.
|
| + # http://crbug.com/271177
|
| + options.AppendExtraBrowserArg('--enable-benchmarking')
|
| + options.AppendExtraBrowserArg('--enable-stats-table')
|
| +
|
| # Temporarily disable typical_25 page set on mac.
|
| if sys.platform == 'darwin' and sys.argv[-1].endswith('/typical_25.json'):
|
| print 'typical_25 is currently disabled on mac. Skipping test.'
|
| @@ -121,6 +129,9 @@ class PageCycler(page_measurement.PageMeasurement):
|
| for h in self._histograms:
|
| h.GetValue(page, tab, results)
|
|
|
| + self._network_metric.Stop(page, tab)
|
| + self._network_metric.AddResults(tab, results)
|
| +
|
| results.Add('page_load_time', 'ms',
|
| int(float(tab.EvaluateJavaScript('__pc_load_time'))),
|
| chart_name='times')
|
|
|