DevTools: move session logic from TracingModel to TimelineModel

Source/devtools/front_end/sdk/TracingModel.js

Index: Source/devtools/front_end/sdk/TracingModel.js
diff --git a/Source/devtools/front_end/sdk/TracingModel.js b/Source/devtools/front_end/sdk/TracingModel.js
index fe861fb5f0b1d89c7d6bfdd786e329c745530385..dc8ee694455305027299ff2d940598412a30c95f 100644
--- a/Source/devtools/front_end/sdk/TracingModel.js
+++ b/Source/devtools/front_end/sdk/TracingModel.js
@@ -55,11 +55,6 @@ WebInspector.TracingModel.ConsoleEventCategory = "blink.console";
 
 WebInspector.TracingModel.FrameLifecycleEventCategory = "cc,devtools";
 
-WebInspector.TracingModel.DevToolsMetadataEvent = {
-    TracingStartedInPage: "TracingStartedInPage",
-    TracingSessionIdForWorker: "TracingSessionIdForWorker",
-};
-
 WebInspector.TracingModel._nestableAsyncEventsString =
     WebInspector.TracingModel.Phase.NestableAsyncBegin +
     WebInspector.TracingModel.Phase.NestableAsyncEnd +
@@ -76,8 +71,6 @@ WebInspector.TracingModel._flowEventsString =
     WebInspector.TracingModel.Phase.FlowStep +
     WebInspector.TracingModel.Phase.FlowEnd;
 
-WebInspector.TracingModel._rendererMainThreadName = "CrRendererMain";
-
 WebInspector.TracingModel._asyncEventsString = WebInspector.TracingModel._nestableAsyncEventsString + WebInspector.TracingModel._legacyAsyncEventsString;
 
 /**
@@ -155,25 +148,9 @@ WebInspector.TracingModel.prototype = {
     /**
      * @return {!Array.<!WebInspector.TracingModel.Event>}
      */
-    devtoolsPageMetadataEvents: function()
-    {
-        return this._devtoolsPageMetadataEvents;
-    },
-
-    /**
-     * @return {!Array.<!WebInspector.TracingModel.Event>}
-     */
-    devtoolsWorkerMetadataEvents: function()
-    {
-        return this._devtoolsWorkerMetadataEvents;
-    },
-
-    /**
-     * @return {?string}
-     */
-    sessionId: function()
+    devToolsMetadataEvents: function()
     {
-        return this._sessionId;
+        return this._devToolsMetadataEvents;
     },
 
     /**
@@ -197,7 +174,6 @@ WebInspector.TracingModel.prototype = {
 
     tracingComplete: function()
     {
-        this._processMetadataEvents();
         this._processPendingAsyncEvents();
         this._backingStorage.finishWriting();
         for (var process of Object.values(this._processById)) {
@@ -213,12 +189,9 @@ WebInspector.TracingModel.prototype = {
         this._processByName = new Map();
         this._minimumRecordTime = 0;
         this._maximumRecordTime = 0;
-        this._sessionId = null;
-        this._devtoolsPageMetadataEvents = [];
-        this._devtoolsWorkerMetadataEvents = [];
+        this._devToolsMetadataEvents = [];
         this._backingStorage.reset();
         this._appendDelimiter = false;
-        this._loadedFromFile = false;
         /** @type {!Array<!WebInspector.TracingModel.Event>} */
         this._asyncEvents = [];
         /** @type {!Map<string, !WebInspector.TracingModel.AsyncEvent>} */
@@ -229,6 +202,7 @@ WebInspector.TracingModel.prototype = {
         this._parsedCategories = new Map();
     },
 
+

[alph, 2015/09/01 21:11:41]

revert plz

     /**
       * @param {!WebInspector.TracingManager.EventPayload} payload
       */
@@ -270,14 +244,8 @@ WebInspector.TracingModel.prototype = {
             if (WebInspector.TracingModel.isAsyncPhase(payload.ph))
                 this._asyncEvents.push(event);
             event._setBackingStorage(backingStorage);
-            if (event.name === WebInspector.TracingModel.DevToolsMetadataEvent.TracingStartedInPage &&
-                event.hasCategory(WebInspector.TracingModel.DevToolsMetadataEventCategory)) {
-                this._devtoolsPageMetadataEvents.push(event);
-            }
-            if (event.name === WebInspector.TracingModel.DevToolsMetadataEvent.TracingSessionIdForWorker &&
-                event.hasCategory(WebInspector.TracingModel.DevToolsMetadataEventCategory)) {
-                this._devtoolsWorkerMetadataEvents.push(event);
-            }
+            if (event.hasCategory(WebInspector.TracingModel.DevToolsMetadataEventCategory))
+                this._devToolsMetadataEvents.push(event);
             return;
         }
         switch (payload.name) {
@@ -298,62 +266,6 @@ WebInspector.TracingModel.prototype = {
         }
     },
 
-    _processMetadataEvents: function()
-    {
-        this._devtoolsPageMetadataEvents.sort(WebInspector.TracingModel.Event.compareStartTime);
-        if (!this._devtoolsPageMetadataEvents.length) {
-            // The trace is probably coming not from DevTools. Make a mock Metadata event.
-            var pageMetaEvent = this._loadedFromFile ? this._makeMockPageMetadataEvent() : null;
-            if (!pageMetaEvent) {
-                console.error(WebInspector.TracingModel.DevToolsMetadataEvent.TracingStartedInPage + " event not found.");
-                return;
-            }
-            this._devtoolsPageMetadataEvents.push(pageMetaEvent);
-        }
-        var sessionId = this._devtoolsPageMetadataEvents[0].args["sessionId"] || this._devtoolsPageMetadataEvents[0].args["data"]["sessionId"];
-        this._sessionId = sessionId;
-
-        var mismatchingIds = {};
-        function checkSessionId(event)
-        {
-            var args = event.args;
-            // FIXME: put sessionId into args["data"] for TracingStartedInPage event.
-            if (args["data"])
-                args = args["data"];
-            var id = args["sessionId"];
-            if (id === sessionId)
-                return true;
-            mismatchingIds[id] = true;
-            return false;
-        }
-        this._devtoolsPageMetadataEvents = this._devtoolsPageMetadataEvents.filter(checkSessionId);
-        this._devtoolsWorkerMetadataEvents = this._devtoolsWorkerMetadataEvents.filter(checkSessionId);
-
-        var idList = Object.keys(mismatchingIds);
-        if (idList.length)
-            WebInspector.console.error("Timeline recording was started in more than one page simultaneously. Session id mismatch: " + this._sessionId + " and " + idList + ".");
-    },
-
-    /**
-     * @return {?WebInspector.TracingModel.Event}
-     */
-    _makeMockPageMetadataEvent: function()
-    {
-        var rendererMainThreadName = WebInspector.TracingModel._rendererMainThreadName;
-        // FIXME: pick up the first renderer process for now.
-        var process = Object.values(this._processById).filter(function(p) { return p.threadByName(rendererMainThreadName); })[0];
-        var thread = process && process.threadByName(rendererMainThreadName);
-        if (!thread)
-            return null;
-        var pageMetaEvent = new WebInspector.TracingModel.Event(
-            WebInspector.TracingModel.DevToolsMetadataEventCategory,
-            WebInspector.TracingModel.DevToolsMetadataEvent.TracingStartedInPage,
-            WebInspector.TracingModel.Phase.Metadata,
-            this._minimumRecordTime, thread);
-        pageMetaEvent.addArgs({"data": {"sessionId": "mockSessionId"}});
-        return pageMetaEvent;
-    },
-
     /**
      * @return {number}
      */
@@ -512,37 +424,6 @@ WebInspector.TracingModel.prototype = {
 
 /**
  * @constructor
- * @param {!WebInspector.TracingModel} tracingModel
- */
-WebInspector.TracingModel.Loader = function(tracingModel)
-{
-    this._tracingModel = tracingModel;
-    this._firstChunkReceived = false;
-}
-
-WebInspector.TracingModel.Loader.prototype = {
-    /**
-     * @param {!Array.<!WebInspector.TracingManager.EventPayload>} events
-     */
-    loadNextChunk: function(events)
-    {
-        if (!this._firstChunkReceived) {
-            this._tracingModel.reset();
-            this._firstChunkReceived = true;
-        }
-        this._tracingModel.addEvents(events);
-    },
-
-    finish: function()
-    {
-        this._tracingModel._loadedFromFile = true;
-        this._tracingModel.tracingComplete();
-    }
-}
-
-
-/**
- * @constructor
  * @param {string} categories
  * @param {string} name
  * @param {!WebInspector.TracingModel.Phase} phase
@@ -945,18 +826,6 @@ WebInspector.TracingModel.Thread = function(process, id)
 }
 
 WebInspector.TracingModel.Thread.prototype = {
-    /**
-     * @return {?WebInspector.Target}
-     */
-    target: function()
-    {
-        //FIXME: correctly specify target
-        if (this.name() === WebInspector.TracingModel._rendererMainThreadName)
-            return WebInspector.targetManager.targets()[0] || null;
-        else
-            return null;
-    },
-
     tracingComplete: function()
     {
         this._asyncEvents.stableSort(WebInspector.TracingModel.Event.compareStartTime);