| 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 from measurements import timeline_controller | 4 from measurements import timeline_controller |
| 5 from metrics import loading | 5 from metrics import loading |
| 6 from metrics import timeline | 6 from metrics import timeline |
| 7 from telemetry.page import page_measurement | 7 from telemetry.page import page_measurement |
| 8 from telemetry.web_perf import timeline_interaction_record as tir_module | 8 from telemetry.web_perf import timeline_interaction_record as tir_module |
| 9 | 9 |
| 10 class LoadingTrace(page_measurement.PageMeasurement): | 10 class LoadingTrace(page_measurement.PageMeasurement): |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 # but we need to wait for the load event. | 24 # but we need to wait for the load event. |
| 25 tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300) | 25 tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300) |
| 26 | 26 |
| 27 # TODO(nduca): when crbug.com/168431 is fixed, modify the page sets to | 27 # TODO(nduca): when crbug.com/168431 is fixed, modify the page sets to |
| 28 # recognize loading as a toplevel action. | 28 # recognize loading as a toplevel action. |
| 29 self._timeline_controller.Stop(tab) | 29 self._timeline_controller.Stop(tab) |
| 30 | 30 |
| 31 loading.LoadingMetric().AddResults(tab, results) | 31 loading.LoadingMetric().AddResults(tab, results) |
| 32 timeline_metric = timeline.LoadTimesTimelineMetric() | 32 timeline_metric = timeline.LoadTimesTimelineMetric() |
| 33 renderer_thread = \ | 33 renderer_thread = \ |
| 34 self._timeline_controller.model.GetRendererThreadFromTab(tab) | 34 self._timeline_controller.model.GetRendererThreadFromTabId(tab.id) |
| 35 record = tir_module.TimelineInteractionRecord( | 35 record = tir_module.TimelineInteractionRecord( |
| 36 "loading_trace_interaction", 0, float('inf')) | 36 "loading_trace_interaction", 0, float('inf')) |
| 37 timeline_metric.AddResults( | 37 timeline_metric.AddResults( |
| 38 self._timeline_controller.model, | 38 self._timeline_controller.model, |
| 39 renderer_thread, | 39 renderer_thread, |
| 40 [record], | 40 [record], |
| 41 results) | 41 results) |
| 42 | 42 |
| 43 def CleanUpAfterPage(self, _, tab): | 43 def CleanUpAfterPage(self, _, tab): |
| 44 self._timeline_controller.CleanUp(tab) | 44 self._timeline_controller.CleanUp(tab) |
| OLD | NEW |