| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 measurements import smoothness_controller | 7 from measurements import smoothness_controller |
| 8 from measurements import timeline_controller | 8 from measurements import timeline_controller |
| 9 from telemetry.core.platform import tracing_category_filter | 9 from telemetry.core.platform import tracing_category_filter |
| 10 from telemetry.core.platform import tracing_options | 10 from telemetry.core.platform import tracing_options |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 if thread.name == _CR_RENDERER_MAIN: | 111 if thread.name == _CR_RENDERER_MAIN: |
| 112 _AddTracingResults(thread.all_slices, results) | 112 _AddTracingResults(thread.all_slices, results) |
| 113 | 113 |
| 114 def CleanUpAfterPage(self, page, tab): | 114 def CleanUpAfterPage(self, page, tab): |
| 115 if tab.browser.platform.tracing_controller.is_tracing_running: | 115 if tab.browser.platform.tracing_controller.is_tracing_running: |
| 116 tab.browser.platform.tracing_controller.Stop() | 116 tab.browser.platform.tracing_controller.Stop() |
| 117 | 117 |
| 118 | 118 |
| 119 class OilpanGCTimesForSmoothness(_OilpanGCTimesBase): | 119 class OilpanGCTimesForSmoothness(_OilpanGCTimesBase): |
| 120 def __init__(self): | 120 def __init__(self): |
| 121 super(OilpanGCTimesForSmoothness, self).__init__('RunSmoothness') | 121 super(OilpanGCTimesForSmoothness, self).__init__('RunPageInteractions') |
| 122 self._interaction = None | 122 self._interaction = None |
| 123 | 123 |
| 124 def WillRunActions(self, page, tab): | 124 def WillRunActions(self, page, tab): |
| 125 runner = action_runner.ActionRunner(tab) | 125 runner = action_runner.ActionRunner(tab) |
| 126 self._interaction = runner.BeginInteraction(_RUN_SMOOTH_ACTIONS, | 126 self._interaction = runner.BeginInteraction(_RUN_SMOOTH_ACTIONS, |
| 127 is_smooth=True) | 127 is_smooth=True) |
| 128 | 128 |
| 129 def DidRunActions(self, page, tab): | 129 def DidRunActions(self, page, tab): |
| 130 self._interaction.End() | 130 self._interaction.End() |
| 131 super(OilpanGCTimesForSmoothness, self).DidRunActions(page, tab) | 131 super(OilpanGCTimesForSmoothness, self).DidRunActions(page, tab) |
| (...skipping 17 matching lines...) Expand all Loading... |
| 149 | 149 |
| 150 class OilpanGCTimesForInternals(_OilpanGCTimesBase): | 150 class OilpanGCTimesForInternals(_OilpanGCTimesBase): |
| 151 def __init__(self): | 151 def __init__(self): |
| 152 super(OilpanGCTimesForInternals, self).__init__() | 152 super(OilpanGCTimesForInternals, self).__init__() |
| 153 | 153 |
| 154 @classmethod | 154 @classmethod |
| 155 def CustomizeBrowserOptions(cls, options): | 155 def CustomizeBrowserOptions(cls, options): |
| 156 # 'expose-internals-for-testing' can be enabled on content shell. | 156 # 'expose-internals-for-testing' can be enabled on content shell. |
| 157 assert 'content-shell' in options.browser_type | 157 assert 'content-shell' in options.browser_type |
| 158 options.AppendExtraBrowserArgs('--expose-internals-for-testing') | 158 options.AppendExtraBrowserArgs('--expose-internals-for-testing') |
| OLD | NEW |