| Index: tools/telemetry/telemetry/core/backends/chrome/inspector_timeline.py
|
| diff --git a/tools/telemetry/telemetry/core/backends/chrome/inspector_timeline.py b/tools/telemetry/telemetry/core/backends/chrome/inspector_timeline.py
|
| index dd63ad81315b49bc704c3247be0580c975111470..e66f6b242c4099bbad3900a500b28aad3a3e20d6 100644
|
| --- a/tools/telemetry/telemetry/core/backends/chrome/inspector_timeline.py
|
| +++ b/tools/telemetry/telemetry/core/backends/chrome/inspector_timeline.py
|
| @@ -3,7 +3,7 @@
|
| # found in the LICENSE file.
|
|
|
| from telemetry.core.backends.chrome import inspector_timeline_data
|
| -from telemetry.core.timeline import model
|
| +from telemetry.core.backends.chrome import timeline_recorder
|
|
|
|
|
| class TabBackendException(Exception):
|
| @@ -11,7 +11,7 @@ class TabBackendException(Exception):
|
| pass
|
|
|
|
|
| -class InspectorTimeline(object):
|
| +class InspectorTimeline(timeline_recorder.TimelineRecorder):
|
| """Implementation of dev tools timeline."""
|
|
|
| class Recorder(object):
|
| @@ -34,13 +34,9 @@ class InspectorTimeline(object):
|
| self._tab.StopTimelineRecording()
|
|
|
| def __init__(self, inspector_backend):
|
| + super(InspectorTimeline, self).__init__()
|
| self._inspector_backend = inspector_backend
|
| self._is_recording = False
|
| - self._timeline_model = None
|
| -
|
| - @property
|
| - def timeline_model(self):
|
| - return self._timeline_model
|
|
|
| def Start(self):
|
| """Starts recording."""
|
| @@ -58,17 +54,17 @@ class InspectorTimeline(object):
|
| self._SendSyncRequest(request)
|
|
|
| def Stop(self):
|
| - """Stops recording and makes a TimelineModel with the event data."""
|
| - assert self._is_recording, 'Stop should be called after Start.'
|
| + """Stops recording and returns timeline event data."""
|
| + if not self._is_recording:
|
| + return None
|
| request = {'method': 'Timeline.stop'}
|
| result = self._SendSyncRequest(request)
|
| - raw_events = result['events']
|
| - timeline_data = inspector_timeline_data.InspectorTimelineData(raw_events)
|
| - self._timeline_model = model.TimelineModel(
|
| - timeline_data=timeline_data, shift_world_to_zero=False)
|
| self._inspector_backend.UnregisterDomain('Timeline')
|
| self._is_recording = False
|
|
|
| + raw_events = result['events']
|
| + return inspector_timeline_data.InspectorTimelineData(raw_events)
|
| +
|
| def _SendSyncRequest(self, request, timeout=60):
|
| """Sends a devtools remote debugging protocol request.
|
|
|
|
|