| Index: tools/perf/perf_tools/image_decoding_benchmark.py
|
| diff --git a/tools/perf/perf_tools/image_decoding_benchmark.py b/tools/perf/perf_tools/image_decoding_benchmark.py
|
| index c14a84cbd368b56049ad7fe4b41f1da588ca2282..ff134316a2b966b58050c83789fc96249e7c4eeb 100644
|
| --- a/tools/perf/perf_tools/image_decoding_benchmark.py
|
| +++ b/tools/perf/perf_tools/image_decoding_benchmark.py
|
| @@ -6,29 +6,37 @@ from telemetry import multi_page_benchmark
|
|
|
|
|
| class ImageDecoding(multi_page_benchmark.MultiPageBenchmark):
|
| - def WillNavigateToPage(self, page, tab):
|
| - tab.StartTimelineRecording()
|
| + # TODO(qinmin): uncomment this after we fix the image decoding benchmark
|
| + # for lazily decoded images
|
| + # def WillNavigateToPage(self, page, tab):
|
| + # tab.StartTimelineRecording()
|
|
|
| def MeasurePage(self, page, tab, results):
|
| - tab.StopTimelineRecording()
|
| - def _IsDone():
|
| - return tab.EvaluateJavaScript('isDone')
|
| + # TODO(qinmin): This android only test may fail after we switch to
|
| + # deferred image decoding and impl-side painting. Before we fix the test,
|
| + # temporarily disable calculation for lazily decoded images.
|
| + # Uncommented the following lines after we fix the timeline for lazily
|
| + # decoded images.
|
| + return
|
| + # tab.StopTimelineRecording()
|
| + # def _IsDone():
|
| + # return tab.EvaluateJavaScript('isDone')
|
|
|
| - decode_image_events = \
|
| - tab.timeline_model.GetAllOfName('DecodeImage')
|
| + # decode_image_events = \
|
| + # tab.timeline_model.GetAllOfName('DecodeImage')
|
|
|
| # If it is a real image benchmark, then store only the last-minIterations
|
| # decode tasks.
|
| - if (hasattr(page,
|
| - 'image_decoding_benchmark_limit_results_to_min_iterations') and
|
| - page.image_decoding_benchmark_limit_results_to_min_iterations):
|
| - assert _IsDone()
|
| - min_iterations = tab.EvaluateJavaScript('minIterations')
|
| - decode_image_events = decode_image_events[-min_iterations:]
|
| + # if (hasattr(page,
|
| + # 'image_decoding_benchmark_limit_results_to_min_iterations') and
|
| + # page.image_decoding_benchmark_limit_results_to_min_iterations):
|
| + # assert _IsDone()
|
| + # min_iterations = tab.EvaluateJavaScript('minIterations')
|
| + # decode_image_events = decode_image_events[-min_iterations:]
|
|
|
| - durations = [d.duration_ms for d in decode_image_events]
|
| - if not durations:
|
| - results.Add('ImageDecoding_avg', 'ms', 'unsupported')
|
| - return
|
| - image_decoding_avg = sum(durations) / len(durations)
|
| - results.Add('ImageDecoding_avg', 'ms', image_decoding_avg)
|
| + # durations = [d.duration_ms for d in decode_image_events]
|
| + # if not durations:
|
| + # results.Add('ImageDecoding_avg', 'ms', 'unsupported')
|
| + # return
|
| + # image_decoding_avg = sum(durations) / len(durations)
|
| + # results.Add('ImageDecoding_avg', 'ms', image_decoding_avg)
|
|
|