DevTools: Support JS frames save/load for tracing timeline.

BUG=363976

Review URL: https://codereview.chromium.org/620123002

git-svn-id: svn://svn.chromium.org/blink/trunk@183164 bbb929c8-8fbe-4397-9dbb-9b2b20218538

Author: a1ph

LayoutTests/inspector/tracing/timeline-enum-stability-expected.txt

@@ -10,6 +10,7 @@ Applications outside of WebKit depend on the stability of the mapping of these t
     CancelAnimationFrame : "CancelAnimationFrame"
     CompositeLayers : "CompositeLayers"
     ConsoleTime : "ConsoleTime"
+    CpuProfile : "CpuProfile"
     DecodeImage : "Decode Image"
     DecodeLazyPixelRef : "Decode LazyPixelRef"
     DrawFrame : "DrawFrame"

Source/devtools/front_end/timeline/TracingModel.js

@@ -568,6 +568,7 @@ WebInspector.TracingModel.Process = function(id)
 {
     WebInspector.TracingModel.NamedObject.call(this);
     this._setName("Process " + id);
+    this._id = id;
     this._threads = {};
     this._objects = {};
     /** @type {!Array.<!WebInspector.TracingManager.EventPayload>} */
@@ -577,6 +578,14 @@ WebInspector.TracingModel.Process = function(id)
 }
 
 WebInspector.TracingModel.Process.prototype = {
+    /**
+     * @return {number}
+     */
+    id: function()
+    {
+        return this._id;
+    },
+
     /**
      * @param {number} id
      * @return {!WebInspector.TracingModel.Thread}

Source/devtools/front_end/timeline/TracingTimelineModel.js

@@ -99,7 +99,11 @@ WebInspector.TracingTimelineModel.RecordType = {
 
     LazyPixelRef: "LazyPixelRef",
     LayerTreeHostImplSnapshot: "cc::LayerTreeHostImpl",
-    PictureSnapshot: "cc::Picture"
+    PictureSnapshot: "cc::Picture",
+
+    // CpuProfile is a virtual event created on frontend to support
+    // serialization of CPU Profiles within tracing timeline data.
+    CpuProfile: "CpuProfile"
 };
 
 /**
@@ -154,8 +158,8 @@ WebInspector.TracingTimelineModel.prototype = {
 
     stopRecording: function()
     {
-        this._stopCallbackBarrier = new CallbackBarrier();
         if (this._jsProfilerStarted) {
+            this._stopCallbackBarrier = new CallbackBarrier();
             this._currentTarget.profilerAgent().stop(this._stopCallbackBarrier.createCallback(this._didStopRecordingJSSamples.bind(this)));
             this._jsProfilerStarted = false;
         }
@@ -210,7 +214,6 @@ WebInspector.TracingTimelineModel.prototype = {
 
     _onTracingComplete: function()
     {
-        this._tracingModel.tracingComplete();
         if (this._stopCallbackBarrier)
             this._stopCallbackBarrier.callWhenDone(this._didStopRecordingTraceEvents.bind(this));
         else
@@ -225,12 +228,19 @@ WebInspector.TracingTimelineModel.prototype = {
     {
         if (error)
             WebInspector.console.error(error);
-        this._cpuProfile = cpuProfile;
+        this._recordedCpuProfile = cpuProfile;
     },
 
     _didStopRecordingTraceEvents: function()
     {
         this._stopCallbackBarrier = null;
+
+        if (this._recordedCpuProfile) {
+            this._injectCpuProfileEvent(this._recordedCpuProfile);
+            this._recordedCpuProfile = null;
+        }
+        this._tracingModel.tracingComplete();
+
         var events = this._tracingModel.devtoolsPageMetadataEvents();
         var workerMetadataEvents = this._tracingModel.devtoolsWorkerMetadataEvents();
 
@@ -257,16 +267,43 @@ WebInspector.TracingTimelineModel.prototype = {
         this._inspectedTargetEvents.sort(WebInspector.TracingModel.Event.compareStartTime);
 
         if (this._cpuProfile) {
-            var jsSamples = WebInspector.TimelineJSProfileProcessor.generateTracingEventsFromCpuProfile(this, this._cpuProfile);
-            this._inspectedTargetEvents = this._inspectedTargetEvents.mergeOrdered(jsSamples, WebInspector.TracingModel.Event.orderedCompareStartTime);
-            this._setMainThreadEvents(this.mainThreadEvents().mergeOrdered(jsSamples, WebInspector.TracingModel.Event.orderedCompareStartTime));
+            this._processCpuProfile(this._cpuProfile);
             this._cpuProfile = null;
         }
-
         this._buildTimelineRecords();
         this.dispatchEventToListeners(WebInspector.TimelineModel.Events.RecordingStopped);
     },
 
+    /**
+     * @param {!ProfilerAgent.CPUProfile} cpuProfile
+     */
+    _injectCpuProfileEvent: function(cpuProfile)
+    {
+        var metaEvent = this._tracingModel.devtoolsPageMetadataEvents().peekLast();
+        if (!metaEvent)
+            return;
+        var cpuProfileEvent = /** @type {!WebInspector.TracingManager.EventPayload} */ ({
+            cat: WebInspector.TracingModel.DevToolsMetadataEventCategory,
+            ph: WebInspector.TracingModel.Phase.Instant,
+            ts: this._tracingModel.maximumRecordTime() * 1000,
+            pid: metaEvent.thread.process().id(),
+            tid: metaEvent.thread.id(),
+            name: WebInspector.TracingTimelineModel.RecordType.CpuProfile,
+            args: { data: { cpuProfile: cpuProfile } }
+        });
+        this._tracingModel.addEvents([cpuProfileEvent]);
+    },
+
+    /**
+     * @param {!ProfilerAgent.CPUProfile} cpuProfile
+     */
+    _processCpuProfile: function(cpuProfile)
+    {
+        var jsSamples = WebInspector.TimelineJSProfileProcessor.generateTracingEventsFromCpuProfile(this, cpuProfile);
+        this._inspectedTargetEvents = this._inspectedTargetEvents.mergeOrdered(jsSamples, WebInspector.TracingModel.Event.orderedCompareStartTime);
+        this._setMainThreadEvents(this.mainThreadEvents().mergeOrdered(jsSamples, WebInspector.TracingModel.Event.orderedCompareStartTime));
+    },
+
     /**
      * @return {number}
      */
@@ -554,6 +591,10 @@ WebInspector.TracingTimelineModel.prototype = {
                 lastMainThreadEvent.stackTrace = event.args["stack"];
             break;
 
+        case recordTypes.CpuProfile:
+            this._cpuProfile = event.args["data"]["cpuProfile"];
+            break;
+
         case recordTypes.ResourceSendRequest:
             this._sendRequestEvents[event.args["data"]["requestId"]] = event;
             event.imageURL = event.args["data"]["url"];