| 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 """Runs spaceport.io's PerfMarks benchmark.""" | 5 """Runs spaceport.io's PerfMarks benchmark.""" | 
| 6 | 6 | 
| 7 import logging | 7 import logging | 
| 8 import os | 8 import os | 
| 9 | 9 | 
| 10 from telemetry import test | 10 from telemetry import test | 
| 11 from telemetry.core import util | 11 from telemetry.core import util | 
| 12 from telemetry.page import page_measurement | 12 from telemetry.page import page_measurement | 
| 13 from telemetry.page import page_set | 13 from telemetry.page import page_set | 
| 14 | 14 | 
| 15 | 15 | 
| 16 class SpaceportMeasurement(page_measurement.PageMeasurement): | 16 class _SpaceportMeasurement(page_measurement.PageMeasurement): | 
| 17   def CustomizeBrowserOptions(self, options): | 17   def CustomizeBrowserOptions(self, options): | 
| 18     options.AppendExtraBrowserArgs('--disable-gpu-vsync') | 18     options.AppendExtraBrowserArgs('--disable-gpu-vsync') | 
| 19 | 19 | 
| 20   def MeasurePage(self, _, tab, results): | 20   def MeasurePage(self, _, tab, results): | 
| 21     tab.WaitForJavaScriptExpression( | 21     tab.WaitForJavaScriptExpression( | 
| 22         '!document.getElementById("start-performance-tests").disabled', 60) | 22         '!document.getElementById("start-performance-tests").disabled', 60) | 
| 23 | 23 | 
| 24     tab.ExecuteJavaScript(""" | 24     tab.ExecuteJavaScript(""" | 
| 25         window.__results = {}; | 25         window.__results = {}; | 
| 26         window.console.log = function(str) { | 26         window.console.log = function(str) { | 
| (...skipping 20 matching lines...) Expand all  Loading... | 
| 47     for key in result_dict: | 47     for key in result_dict: | 
| 48       chart, trace = key.split('.', 1) | 48       chart, trace = key.split('.', 1) | 
| 49       results.Add(trace, 'objects (bigger is better)', float(result_dict[key]), | 49       results.Add(trace, 'objects (bigger is better)', float(result_dict[key]), | 
| 50                   chart_name=chart, data_type='unimportant') | 50                   chart_name=chart, data_type='unimportant') | 
| 51     results.Add('Score', 'objects (bigger is better)', | 51     results.Add('Score', 'objects (bigger is better)', | 
| 52                 [float(x) for x in result_dict.values()]) | 52                 [float(x) for x in result_dict.values()]) | 
| 53 | 53 | 
| 54 | 54 | 
| 55 class Spaceport(test.Test): | 55 class Spaceport(test.Test): | 
| 56   """spaceport.io's PerfMarks benchmark.""" | 56   """spaceport.io's PerfMarks benchmark.""" | 
| 57   test = SpaceportMeasurement | 57   test = _SpaceportMeasurement | 
| 58 | 58 | 
| 59   def CreatePageSet(self, options): | 59   def CreatePageSet(self, options): | 
| 60     spaceport_dir = os.path.join(util.GetChromiumSrcDir(), 'chrome', 'test', | 60     spaceport_dir = os.path.join(util.GetChromiumSrcDir(), 'chrome', 'test', | 
| 61         'data', 'third_party', 'spaceport') | 61         'data', 'third_party', 'spaceport') | 
| 62     return page_set.PageSet.FromDict( | 62     return page_set.PageSet.FromDict( | 
| 63         {'pages': [{'url': 'file://index.html'}]}, | 63         {'pages': [{'url': 'file://index.html'}]}, | 
| 64         spaceport_dir) | 64         spaceport_dir) | 
| OLD | NEW | 
|---|