Index: tools/telemetry/telemetry/core/backends/chrome/inspector_backend.py |
diff --git a/tools/telemetry/telemetry/core/backends/chrome/inspector_backend.py b/tools/telemetry/telemetry/core/backends/chrome/inspector_backend.py |
index 15369ffd493344fb6e85e2c1ced7474ed57a8a80..172f62b34114926b2ba9110e1e4cb6df860ea4d8 100644 |
--- a/tools/telemetry/telemetry/core/backends/chrome/inspector_backend.py |
+++ b/tools/telemetry/telemetry/core/backends/chrome/inspector_backend.py |
@@ -18,8 +18,8 @@ from telemetry.core.backends.chrome import inspector_runtime |
from telemetry.core.backends.chrome import inspector_timeline |
from telemetry.core.backends.chrome import inspector_websocket |
from telemetry.core.backends.chrome import websocket |
-from telemetry.core.heap import model |
-from telemetry.timeline import model as timeline_model |
+from telemetry.core.heap import model as heap_model_module |
+from telemetry.timeline import model as timeline_model_module |
from telemetry.timeline import recording_options |
@@ -193,16 +193,21 @@ class InspectorBackend(inspector_websocket.InspectorWebsocket): |
self._network.timeline_recorder.Start() |
def StopTimelineRecording(self): |
- data = [] |
- timeline_data = self._timeline.Stop() |
- if timeline_data: |
- data.append(timeline_data) |
- network_data = self._network.timeline_recorder.Stop() |
- if network_data: |
- data.append(network_data) |
+ builder = trace_value_module.TraceValueBuilder() |
+ |
+ data = self._timeline.Stop() |
+ if data: |
+ builder.AddEventsTo( |
+ trace_value_module.INSPECTOR_TRACE_PART, data) |
+ |
+ data = self._network.timeline_recorder.Stop() |
if data: |
- self._timeline_model = timeline_model.TimelineModel( |
- timeline_data=data, shift_world_to_zero=False) |
+ builder.AddEventsTo( |
+ trace_value_module.INSPECTOR_TRACE_PART, data) |
+ |
+ if builder.HasEventsFor(trace_value_module.INSPECTOR_TRACE_PART): |
+ self._timeline_model = timeline_model_module.TimelineModel( |
+ builder.AsValue(), shift_world_to_zero=False) |
else: |
self._timeline_model = None |
@@ -315,4 +320,4 @@ class InspectorBackend(inspector_websocket.InspectorWebsocket): |
snapshot = ''.join(snapshot) |
self.UnregisterDomain('HeapProfiler') |
- return model.Model(snapshot) |
+ return heap_model_module.Model(snapshot) |