| Index: tools/perf/measurements/blink_style.py
|
| diff --git a/tools/perf/measurements/blink_style.py b/tools/perf/measurements/blink_style.py
|
| index f89ab980085c4fc912debb5ce4d6af451428a12b..bbb4ca9c4edb6af48f0888a3b3b48984ade6068b 100644
|
| --- a/tools/perf/measurements/blink_style.py
|
| +++ b/tools/perf/measurements/blink_style.py
|
| @@ -4,8 +4,8 @@
|
|
|
| from itertools import starmap
|
| from collections import defaultdict
|
| -
|
| from telemetry.core import util
|
| +from telemetry.core import exceptions
|
| from telemetry.page import page_test
|
| from telemetry.value import scalar
|
|
|
| @@ -19,7 +19,7 @@ class BlinkStyle(page_test.PageTest):
|
|
|
| def WillNavigateToPage(self, page, tab):
|
| self._controller = timeline_controller.TimelineController()
|
| - self._controller.trace_categories = 'blink,benchmark,blink.console'
|
| + self._controller.trace_categories = 'blink_style,blink.console'
|
| self._controller.SetUp(page, tab)
|
| self._controller.Start(tab)
|
|
|
| @@ -28,9 +28,12 @@ class BlinkStyle(page_test.PageTest):
|
| self._controller.CleanUp(tab)
|
|
|
| def ValidateAndMeasurePage(self, page, tab, results):
|
| - tab.WaitForDocumentReadyStateToBeComplete()
|
| - if not util.WaitFor(tab.HasReachedQuiescence, 30):
|
| - raise page_test.MeasurementFailure('Failed to reach quiesence.')
|
| + tab.ExecuteJavaScript('console.time("wait-for-quiescence");')
|
| + try:
|
| + util.WaitFor(tab.HasReachedQuiescence, 15)
|
| + except exceptions.TimeoutException:
|
| + pass
|
| + tab.ExecuteJavaScript('console.timeEnd("wait-for-quiescence");')
|
|
|
| tab.ExecuteJavaScript(
|
| 'console.time("style-update");'
|
|
|