| 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 from telemetry.page import page_test | 5 from telemetry.page import page_test |
| 6 from telemetry.timeline import tracing_category_filter | 6 from telemetry.timeline import tracing_category_filter |
| 7 from telemetry.web_perf.metrics import layout | 7 from telemetry.web_perf.metrics import layout |
| 8 | 8 |
| 9 from measurements import timeline_controller | 9 from measurements import timeline_controller |
| 10 from metrics import timeline | 10 from metrics import timeline |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 enable_auto_issuing_record=False) | 22 enable_auto_issuing_record=False) |
| 23 if self._report_silk_details: | 23 if self._report_silk_details: |
| 24 # We need the other traces in order to have any details to report. | 24 # We need the other traces in order to have any details to report. |
| 25 self._timeline_controller.trace_categories = None | 25 self._timeline_controller.trace_categories = None |
| 26 else: | 26 else: |
| 27 self._timeline_controller.trace_categories = \ | 27 self._timeline_controller.trace_categories = \ |
| 28 tracing_category_filter.CreateNoOverheadFilter().filter_string | 28 tracing_category_filter.CreateNoOverheadFilter().filter_string |
| 29 self._timeline_controller.SetUp(page, tab) | 29 self._timeline_controller.SetUp(page, tab) |
| 30 | 30 |
| 31 def DidNavigateToPage(self, page, tab): | 31 def DidNavigateToPage(self, page, tab): |
| 32 del page # unused |
| 32 self._timeline_controller.Start(tab) | 33 self._timeline_controller.Start(tab) |
| 33 | 34 |
| 34 def ValidateAndMeasurePage(self, page, tab, results): | 35 def ValidateAndMeasurePage(self, page, tab, results): |
| 36 del page # unused |
| 35 self._timeline_controller.Stop(tab, results) | 37 self._timeline_controller.Stop(tab, results) |
| 36 metric = timeline.ThreadTimesTimelineMetric() | 38 metric = timeline.ThreadTimesTimelineMetric() |
| 37 renderer_thread = \ | 39 renderer_thread = \ |
| 38 self._timeline_controller.model.GetRendererThreadFromTabId(tab.id) | 40 self._timeline_controller.model.GetRendererThreadFromTabId(tab.id) |
| 39 if self._report_silk_details: | 41 if self._report_silk_details: |
| 40 metric.details_to_report = timeline.ReportSilkDetails | 42 metric.details_to_report = timeline.ReportSilkDetails |
| 41 metric.AddResults(self._timeline_controller.model, renderer_thread, | 43 metric.AddResults(self._timeline_controller.model, renderer_thread, |
| 42 self._timeline_controller.smooth_records, results) | 44 self._timeline_controller.smooth_records, results) |
| 43 layout_metric = layout.LayoutMetric() | 45 layout_metric = layout.LayoutMetric() |
| 44 layout_metric.AddResults(self._timeline_controller.model, renderer_thread, | 46 layout_metric.AddResults(self._timeline_controller.model, renderer_thread, |
| 45 self._timeline_controller.smooth_records, results) | 47 self._timeline_controller.smooth_records, results) |
| 46 | 48 |
| 47 def DidRunPage(self, platform): | 49 def DidRunPage(self, platform): |
| 48 if self._timeline_controller: | 50 if self._timeline_controller: |
| 49 self._timeline_controller.CleanUp(platform) | 51 self._timeline_controller.CleanUp(platform) |
| OLD | NEW |