| OLD | NEW | 
|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 import logging | 5 import logging | 
| 6 | 6 | 
| 7 from telemetry import multi_page_benchmark | 7 from telemetry.core import util | 
| 8 from telemetry import util | 8 from telemetry.page import multi_page_benchmark | 
| 9 | 9 | 
| 10 class SpaceportBenchmark(multi_page_benchmark.MultiPageBenchmark): | 10 class SpaceportBenchmark(multi_page_benchmark.MultiPageBenchmark): | 
| 11   def CustomizeBrowserOptions(self, options): | 11   def CustomizeBrowserOptions(self, options): | 
| 12     options.extra_browser_args.extend(['--disable-gpu-vsync']) | 12     options.extra_browser_args.extend(['--disable-gpu-vsync']) | 
| 13 | 13 | 
| 14   def MeasurePage(self, _, tab, results): | 14   def MeasurePage(self, _, tab, results): | 
| 15     util.WaitFor(lambda: tab.EvaluateJavaScript( | 15     util.WaitFor(lambda: tab.EvaluateJavaScript( | 
| 16         '!document.getElementById("start-performance-tests").disabled'), 60) | 16         '!document.getElementById("start-performance-tests").disabled'), 60) | 
| 17 | 17 | 
| 18     tab.ExecuteJavaScript(""" | 18     tab.ExecuteJavaScript(""" | 
| (...skipping 19 matching lines...) Expand all  Loading... | 
| 38       return num_tests_complete[0] >= num_tests_in_benchmark | 38       return num_tests_complete[0] >= num_tests_in_benchmark | 
| 39     util.WaitFor(_IsDone, 1200, poll_interval=5) | 39     util.WaitFor(_IsDone, 1200, poll_interval=5) | 
| 40 | 40 | 
| 41     result_dict = eval(tab.EvaluateJavaScript(js_get_results)) | 41     result_dict = eval(tab.EvaluateJavaScript(js_get_results)) | 
| 42     for key in result_dict: | 42     for key in result_dict: | 
| 43       chart, trace = key.split('.', 1) | 43       chart, trace = key.split('.', 1) | 
| 44       results.Add(trace, 'objects (bigger is better)', float(result_dict[key]), | 44       results.Add(trace, 'objects (bigger is better)', float(result_dict[key]), | 
| 45                   chart_name=chart, data_type='unimportant') | 45                   chart_name=chart, data_type='unimportant') | 
| 46     results.Add('Overall', 'objects (bigger is better)', | 46     results.Add('Overall', 'objects (bigger is better)', | 
| 47                 [float(x) for x in result_dict.values()]) | 47                 [float(x) for x in result_dict.values()]) | 
| OLD | NEW | 
|---|