| 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 os | 5 import os | 
| 6 | 6 | 
| 7 from telemetry import test | 7 from telemetry import test | 
| 8 from telemetry.core import util | 8 from telemetry.core import util | 
| 9 from telemetry.page import page_measurement | 9 from telemetry.page import page_measurement | 
| 10 from telemetry.page import page_set | 10 from telemetry.page import page_set | 
| 11 | 11 | 
| 12 | 12 | 
| 13 class OctaneMeasurement(page_measurement.PageMeasurement): | 13 class _OctaneMeasurement(page_measurement.PageMeasurement): | 
| 14   def MeasurePage(self, _, tab, results): | 14   def MeasurePage(self, _, tab, results): | 
| 15     tab.WaitForJavaScriptExpression( | 15     tab.WaitForJavaScriptExpression( | 
| 16         'completed && !document.getElementById("progress-bar-container")', 300) | 16         'completed && !document.getElementById("progress-bar-container")', 300) | 
| 17 | 17 | 
| 18     js_get_results = """ | 18     js_get_results = """ | 
| 19 var results = {}; | 19 var results = {}; | 
| 20 var result_divs = document.querySelectorAll('.p-result'); | 20 var result_divs = document.querySelectorAll('.p-result'); | 
| 21 for (var r in result_divs) { | 21 for (var r in result_divs) { | 
| 22   if (result_divs[r].id && result_divs[r].id.indexOf('Result-') == 0) { | 22   if (result_divs[r].id && result_divs[r].id.indexOf('Result-') == 0) { | 
| 23     var key = result_divs[r].id.replace('Result-', ''); | 23     var key = result_divs[r].id.replace('Result-', ''); | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 34       if value == '...': | 34       if value == '...': | 
| 35         continue | 35         continue | 
| 36       data_type = 'unimportant' | 36       data_type = 'unimportant' | 
| 37       if key == 'score': | 37       if key == 'score': | 
| 38         data_type = 'default' | 38         data_type = 'default' | 
| 39       results.Add(key, 'score (bigger is better)', value, data_type=data_type) | 39       results.Add(key, 'score (bigger is better)', value, data_type=data_type) | 
| 40 | 40 | 
| 41 | 41 | 
| 42 class Octane(test.Test): | 42 class Octane(test.Test): | 
| 43   """Google's Octane JavaScript benchmark.""" | 43   """Google's Octane JavaScript benchmark.""" | 
| 44   test = OctaneMeasurement | 44   test = _OctaneMeasurement | 
| 45 | 45 | 
| 46   def CreatePageSet(self, options): | 46   def CreatePageSet(self, options): | 
| 47     octane_dir = os.path.join(util.GetChromiumSrcDir(), 'chrome', 'test', | 47     octane_dir = os.path.join(util.GetChromiumSrcDir(), 'chrome', 'test', | 
| 48                               'data', 'perf', 'third_party', 'octane') | 48                               'data', 'perf', 'third_party', 'octane') | 
| 49     return page_set.PageSet.FromDict({ | 49     return page_set.PageSet.FromDict({ | 
| 50         'pages': [ | 50         'pages': [ | 
| 51           { 'url': 'file://index.html?auto=1' } | 51           { 'url': 'file://index.html?auto=1' } | 
| 52           ] | 52           ] | 
| 53         }, octane_dir) | 53         }, octane_dir) | 
| OLD | NEW | 
|---|