| Index: tools/perf/measurements/rasterize_and_record_micro.py
|
| diff --git a/tools/perf/measurements/rasterize_and_record_micro.py b/tools/perf/measurements/rasterize_and_record_micro.py
|
| index 34e36f4df7f0a71ae2fbc4e1e132b1e9a1ec5fab..a5cc549376a64b862628e5facfe3ac5739a0927b 100644
|
| --- a/tools/perf/measurements/rasterize_and_record_micro.py
|
| +++ b/tools/perf/measurements/rasterize_and_record_micro.py
|
| @@ -2,12 +2,12 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| -import logging
|
| import sys
|
| import time
|
|
|
| from telemetry.core.util import TimeoutException
|
| from telemetry.page import page_measurement
|
| +from telemetry.page import page_test
|
|
|
| class RasterizeAndRecordMicro(page_measurement.PageMeasurement):
|
| def __init__(self):
|
| @@ -49,7 +49,9 @@ class RasterizeAndRecordMicro(page_measurement.PageMeasurement):
|
| backend = browser._browser_backend # pylint: disable=W0212
|
| if (not hasattr(backend, 'chrome_branch_number') or
|
| (sys.platform != 'android' and backend.chrome_branch_number < 1713)):
|
| - return
|
| + raise page_test.TestNotSupportedOnPlatformFailure(
|
| + 'rasterize_and_record_micro requires Chrome branch 1713 '
|
| + 'or later. Skipping measurement.')
|
|
|
| # Check if the we actually have threaded forced compositing enabled.
|
| system_info = browser.GetSystemInfo()
|
| @@ -59,10 +61,11 @@ class RasterizeAndRecordMicro(page_measurement.PageMeasurement):
|
| self._compositing_features_enabled = True
|
|
|
| def MeasurePage(self, page, tab, results):
|
| + # Throw an exception if threaded forced compositing is not enabled.
|
| if not self._compositing_features_enabled:
|
| - logging.warning('Warning: RasterizeAndRecordMicro requires forced, '
|
| - 'threaded compositing and Chrome branch 1713 or newer.')
|
| - return
|
| + raise page_test.TestNotSupportedOnPlatformFailure(
|
| + 'Compositing feature status unknown or not '+
|
| + 'forced and threaded. Skipping measurement.')
|
|
|
| try:
|
| tab.WaitForJavaScriptExpression("document.readyState == 'complete'", 10)
|
| @@ -130,4 +133,3 @@ class RasterizeAndRecordMicro(page_measurement.PageMeasurement):
|
| total_picture_layers_with_no_content)
|
| results.Add('total_picture_layers_off_screen', 'count',
|
| total_picture_layers_off_screen)
|
| -
|
|
|