Chromium Code Reviews| 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 | |
| 5 import os | |
| 6 | |
| 4 from telemetry.core import util | 7 from telemetry.core import util |
| 5 from telemetry.page import page_measurement | 8 from telemetry.page import page_measurement |
| 9 from telemetry.page import page_set | |
| 6 | 10 |
| 7 class Octane(page_measurement.PageMeasurement): | 11 class Octane(page_measurement.PageMeasurement): |
| 12 def CreatePageSet(self, options): | |
| 13 return page_set.PageSet.FromDict({ | |
|
nduca
2013/05/20 18:34:02
should we modify the page_runner to explode if the
dtu
2013/05/20 18:44:31
Just make the parameter not-optional in PageSet. I
| |
| 14 'pages': [ | |
| 15 { 'url': 'file:///../../../chrome/test/data/perf/third_party/octane/' | |
| 16 'index.html?auto=1' } | |
| 17 ] | |
| 18 }, file_path=os.path.abspath(__file__)) | |
| 19 | |
| 8 def MeasurePage(self, _, tab, results): | 20 def MeasurePage(self, _, tab, results): |
| 9 js_is_done = """ | 21 js_is_done = """ |
| 10 completed && !document.getElementById("progress-bar-container")""" | 22 completed && !document.getElementById("progress-bar-container")""" |
| 11 def _IsDone(): | 23 def _IsDone(): |
| 12 return bool(tab.EvaluateJavaScript(js_is_done)) | 24 return bool(tab.EvaluateJavaScript(js_is_done)) |
| 13 util.WaitFor(_IsDone, 300, poll_interval=5) | 25 util.WaitFor(_IsDone, 300, poll_interval=5) |
| 14 | 26 |
| 15 js_get_results = """ | 27 js_get_results = """ |
| 16 var results = {} | 28 var results = {} |
| 17 var result_divs = document.querySelectorAll('.p-result'); | 29 var result_divs = document.querySelectorAll('.p-result'); |
| 18 for (var r in result_divs) { | 30 for (var r in result_divs) { |
| 19 if (result_divs[r].id && result_divs[r].id.indexOf('Result-') == 0) | 31 if (result_divs[r].id && result_divs[r].id.indexOf('Result-') == 0) |
| 20 var key = result_divs[r].id.replace('Result-', ''); | 32 var key = result_divs[r].id.replace('Result-', ''); |
| 21 results[key] = result_divs[r].innerHTML; | 33 results[key] = result_divs[r].innerHTML; |
| 22 } | 34 } |
| 23 var main_banner = document.getElementById("main-banner").innerHTML; | 35 var main_banner = document.getElementById("main-banner").innerHTML; |
| 24 var octane_score = main_banner.substr(main_banner.lastIndexOf(':') + 2); | 36 var octane_score = main_banner.substr(main_banner.lastIndexOf(':') + 2); |
| 25 results['score'] = octane_score; | 37 results['score'] = octane_score; |
| 26 JSON.stringify(results); | 38 JSON.stringify(results); |
| 27 """ | 39 """ |
| 28 result_dict = eval(tab.EvaluateJavaScript(js_get_results)) | 40 result_dict = eval(tab.EvaluateJavaScript(js_get_results)) |
| 29 for key, value in result_dict.iteritems(): | 41 for key, value in result_dict.iteritems(): |
| 30 if value == '...': | 42 if value == '...': |
| 31 continue | 43 continue |
| 32 data_type = 'unimportant' | 44 data_type = 'unimportant' |
| 33 if key == 'score': | 45 if key == 'score': |
| 34 data_type = 'default' | 46 data_type = 'default' |
| 35 results.Add(key, 'score (bigger is better)', value, data_type=data_type) | 47 results.Add(key, 'score (bigger is better)', value, data_type=data_type) |
| OLD | NEW |