| Index: Source/devtools/front_end/TimelineModel.js
|
| diff --git a/Source/devtools/front_end/TimelineModel.js b/Source/devtools/front_end/TimelineModel.js
|
| index 347f744bc0dfd99a73efe6b90f1b98d205e9961a..a2085eb9b4991f9da0f1625873ea49f965e61d19 100644
|
| --- a/Source/devtools/front_end/TimelineModel.js
|
| +++ b/Source/devtools/front_end/TimelineModel.js
|
| @@ -51,6 +51,8 @@ WebInspector.TimelineModel.RecordType = {
|
| Program: "Program",
|
| EventDispatch: "EventDispatch",
|
|
|
| + GpuTask: "GpuTask",
|
| +
|
| BeginFrame: "BeginFrame",
|
| ScheduleStyleRecalculation: "ScheduleStyleRecalculation",
|
| RecalculateStyles: "RecalculateStyles",
|
| @@ -115,7 +117,7 @@ WebInspector.TimelineModel.startTimeInSeconds = function(record)
|
|
|
| WebInspector.TimelineModel.endTimeInSeconds = function(record)
|
| {
|
| - return (typeof record.endTime === "undefined" ? record.startTime : record.endTime) / 1000;
|
| + return (record.endTime || record.startTime) / 1000;
|
| }
|
|
|
| WebInspector.TimelineModel.durationInSeconds = function(record)
|
| @@ -159,7 +161,8 @@ WebInspector.TimelineModel.prototype = {
|
| this._clientInitiatedRecording = true;
|
| this.reset();
|
| var maxStackFrames = WebInspector.settings.timelineLimitStackFramesFlag.get() ? WebInspector.settings.timelineStackFramesToCapture.get() : 30;
|
| - WebInspector.timelineManager.start(maxStackFrames, includeDomCounters, this._fireRecordingStarted.bind(this));
|
| + var includeGpuEvents = WebInspector.experimentsSettings.gpuTimeline.isEnabled();
|
| + WebInspector.timelineManager.start(maxStackFrames, includeDomCounters, includeGpuEvents, this._fireRecordingStarted.bind(this));
|
| },
|
|
|
| stopRecording: function()
|
| @@ -172,7 +175,7 @@ WebInspector.TimelineModel.prototype = {
|
| WebInspector.timelineManager.stop(this._fireRecordingStopped.bind(this));
|
| }
|
|
|
| - WebInspector.timelineManager.start(undefined, undefined, stopTimeline.bind(this));
|
| + WebInspector.timelineManager.start(undefined, undefined, undefined, stopTimeline.bind(this));
|
| return;
|
| }
|
| this._clientInitiatedRecording = false;
|
|
|