| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 import collections | 4 import collections |
| 5 import json | 5 import json |
| 6 import os | 6 import os |
| 7 | 7 |
| 8 from metrics import power | 8 from metrics import power |
| 9 from telemetry import benchmark | 9 from telemetry import benchmark |
| 10 from telemetry.page import page_measurement | 10 from telemetry.page import page_measurement |
| 11 from telemetry.page import page_set | 11 from telemetry.page import page_set |
| 12 | 12 |
| 13 | 13 |
| 14 _URL = 'http://www.webkit.org/perf/sunspider-1.0.2/sunspider-1.0.2/driver.html' | 14 _URL = 'http://www.webkit.org/perf/sunspider-1.0.2/sunspider-1.0.2/driver.html' |
| 15 | 15 |
| 16 | 16 |
| 17 class _SunspiderMeasurement(page_measurement.PageMeasurement): | 17 class _SunspiderMeasurement(page_measurement.PageMeasurement): |
| 18 def __init__(self): | 18 def __init__(self): |
| 19 super(_SunspiderMeasurement, self).__init__() | 19 super(_SunspiderMeasurement, self).__init__() |
| 20 self._power_metric = power.PowerMetric() | 20 self._power_metric = None |
| 21 | 21 |
| 22 def CustomizeBrowserOptions(self, options): | 22 def CustomizeBrowserOptions(self, options): |
| 23 power.PowerMetric.CustomizeBrowserOptions(options) | 23 power.PowerMetric.CustomizeBrowserOptions(options) |
| 24 | 24 |
| 25 def WillStartBrowser(self, browser): |
| 26 self._power_metric = power.PowerMetric(browser) |
| 27 |
| 25 def DidNavigateToPage(self, page, tab): | 28 def DidNavigateToPage(self, page, tab): |
| 26 self._power_metric.Start(page, tab) | 29 self._power_metric.Start(page, tab) |
| 27 | 30 |
| 28 def MeasurePage(self, page, tab, results): | 31 def MeasurePage(self, page, tab, results): |
| 29 tab.WaitForJavaScriptExpression( | 32 tab.WaitForJavaScriptExpression( |
| 30 'window.location.pathname.indexOf("results.html") >= 0' | 33 'window.location.pathname.indexOf("results.html") >= 0' |
| 31 '&& typeof(output) != "undefined"', 300) | 34 '&& typeof(output) != "undefined"', 300) |
| 32 | 35 |
| 33 self._power_metric.Stop(page, tab) | 36 self._power_metric.Stop(page, tab) |
| 34 self._power_metric.AddResults(tab, results) | 37 self._power_metric.AddResults(tab, results) |
| (...skipping 20 matching lines...) Expand all Loading... |
| 55 """Apple's SunSpider JavaScript benchmark.""" | 58 """Apple's SunSpider JavaScript benchmark.""" |
| 56 test = _SunspiderMeasurement | 59 test = _SunspiderMeasurement |
| 57 | 60 |
| 58 def CreatePageSet(self, options): | 61 def CreatePageSet(self, options): |
| 59 ps = page_set.PageSet( | 62 ps = page_set.PageSet( |
| 60 archive_data_file='../page_sets/data/sunspider.json', | 63 archive_data_file='../page_sets/data/sunspider.json', |
| 61 make_javascript_deterministic=False, | 64 make_javascript_deterministic=False, |
| 62 file_path=os.path.abspath(__file__)) | 65 file_path=os.path.abspath(__file__)) |
| 63 ps.AddPageWithDefaultRunNavigate(_URL) | 66 ps.AddPageWithDefaultRunNavigate(_URL) |
| 64 return ps | 67 return ps |
| OLD | NEW |