| 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 | 4 |
| 5 import os | 5 import os |
| 6 | 6 |
| 7 from metrics import power | 7 from metrics import power |
| 8 from telemetry import test | 8 from telemetry import test |
| 9 from telemetry.core import util | 9 from telemetry.core import util |
| 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 class _DromaeoMeasurement(page_measurement.PageMeasurement): | 14 class _DromaeoMeasurement(page_measurement.PageMeasurement): |
| 15 def __init__(self): | 15 def __init__(self): |
| 16 super(_DromaeoMeasurement, self).__init__() | 16 super(_DromaeoMeasurement, self).__init__() |
| 17 self._power_metric = power.PowerMetric() | 17 self._power_metric = None |
| 18 | 18 |
| 19 def CustomizeBrowserOptions(self, options): | 19 def CustomizeBrowserOptions(self, options): |
| 20 power.PowerMetric.CustomizeBrowserOptions(options) | 20 power.PowerMetric.CustomizeBrowserOptions(options) |
| 21 | 21 |
| 22 def WillStartBrowser(self, browser): |
| 23 self._power_metric = power.PowerMetric(browser) |
| 24 |
| 22 def DidNavigateToPage(self, page, tab): | 25 def DidNavigateToPage(self, page, tab): |
| 23 self._power_metric.Start(page, tab) | 26 self._power_metric.Start(page, tab) |
| 24 | 27 |
| 25 def MeasurePage(self, page, tab, results): | 28 def MeasurePage(self, page, tab, results): |
| 26 tab.WaitForJavaScriptExpression( | 29 tab.WaitForJavaScriptExpression( |
| 27 'window.document.cookie.indexOf("__done=1") >= 0', 600) | 30 'window.document.cookie.indexOf("__done=1") >= 0', 600) |
| 28 | 31 |
| 29 self._power_metric.Stop(page, tab) | 32 self._power_metric.Stop(page, tab) |
| 30 self._power_metric.AddResults(tab, results) | 33 self._power_metric.AddResults(tab, results) |
| 31 | 34 |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 """Dromaeo JSLib traverse jquery JavaScript benchmark""" | 144 """Dromaeo JSLib traverse jquery JavaScript benchmark""" |
| 142 tag = 'jslibtraversejquery' | 145 tag = 'jslibtraversejquery' |
| 143 query_param = 'jslib-traverse-jquery' | 146 query_param = 'jslib-traverse-jquery' |
| 144 | 147 |
| 145 | 148 |
| 146 class DromaeoJslibTraversePrototype(_DromaeoBenchmark): | 149 class DromaeoJslibTraversePrototype(_DromaeoBenchmark): |
| 147 """Dromaeo JSLib traverse prototype JavaScript benchmark""" | 150 """Dromaeo JSLib traverse prototype JavaScript benchmark""" |
| 148 tag = 'jslibtraverseprototype' | 151 tag = 'jslibtraverseprototype' |
| 149 query_param = 'jslib-traverse-prototype' | 152 query_param = 'jslib-traverse-prototype' |
| 150 | 153 |
| OLD | NEW |