DevTools: process events from all threads in TimelineTraceEventBindings

Source/devtools/front_end/timeline/TracingModel.js

 /*
  * Copyright 2014 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /**
  * @constructor
  * @extends {WebInspector.TargetAwareObject}
  */
@@ skipping 53 matching lines @@
     ThreadSortIndex: "thread_sort_index",
     ThreadName: "thread_name"
 }
 
 WebInspector.TracingModel.DevToolsMetadataEventCategory = "disabled-by-default-devtools.timeline";
 
 WebInspector.TracingModel.FrameLifecycleEventCategory = "cc,devtools";
 
 WebInspector.TracingModel.DevToolsMetadataEvent = {
     TracingStartedInPage: "TracingStartedInPage",
-    SetLayerTreeId: "SetLayerTreeId"
-};
-
-WebInspector.TracingModel.TraceEventName = {
-    ActivateLayerTree: "ActivateLayerTree",
-    BeginFrame: "BeginFrame",
-    BeginMainThreadFrame: "BeginMainThreadFrame",
-    CompositeLayers: "CompositeLayers",
-    DrawFrame: "DrawFrame",
-    PaintSetup: "PaintSetup",
-    RasterTask: "RasterTask",
-    RequestMainThreadFrame: "RequestMainThreadFrame",
-    LayerTreeHostImplSnapshot: "cc::LayerTreeHostImpl"
 };
 
 WebInspector.TracingModel.prototype = {
     /**
      * @return {!Array.<!WebInspector.TracingModel.Event>}
      */
-    inspectedTargetMainThreadEvents: function()
-    {
-        return this._inspectedTargetMainThreadEvents;
-    },
-
-    /**
-     * @return {!Array.<!WebInspector.TracingModel.Event>}
-     */
-    frameLifecycleEvents: function()
+    inspectedTargetEvents: function()
     {
         /**
          * @param {!WebInspector.TracingModel.Event} a
          * @param {!WebInspector.TracingModel.Event} b
          */
         function compareStartTime(a, b)
         {
             return a.startTime - b.startTime;
         }
-        return this._frameLifecycleEvents.sort(compareStartTime);
+
+        if (this._needToSortInspectedTargetEvents) {

[yurys, 2014/05/27 15:41:32]

Can we just sort them once after all events have been processed?

+            this._inspectedTargetEvents.sort(compareStartTime);
+            this._needToSortInspectedTargetEvents = false;
+        }
+        return this._inspectedTargetEvents;
     },
 
     /**
      * @param {string} categoryFilter
      * @param {string} options
      * @param {function(?string)=} callback
      */
     start: function(categoryFilter, options, callback)
     {
         this.reset();
@@ skipping 68 matching lines @@
         this._pendingStopCallback = null;
     },
 
     reset: function()
     {
         this._processById = {};
         this._minimumRecordTime = null;
         this._maximumRecordTime = null;
         this._sessionId = null;
         this._inspectedTargetProcessId = null;
-        this._inspectedTargetMainThread = null;
-        this._inspectedTargetMainThreadEvents = [];
-        this._inspectedTargetLayerTreeHostId = 0;
-        this._frameLifecycleEvents = [];
+        this._inspectedTargetEvents = [];
     },
 
     /**
       * @param {!WebInspector.TracingModel.EventPayload} payload
       */
     _addEvent: function(payload)
     {
         var process = this._processById[payload.pid];
         if (!process) {
             process = new WebInspector.TracingModel.Process(payload.pid);
             this._processById[payload.pid] = process;
         }
         if (payload.ph === WebInspector.TracingModel.Phase.SnapshotObject) {
             process.addObject(payload);
-            if (payload.pid === this._inspectedTargetProcessId && payload.name === "cc::LayerTreeHostImpl" && parseInt(payload.id, 0) === this._inspectedTargetLayerTreeId)
-                this._frameLifecycleEvents.push(new WebInspector.TracingModel.Event(payload, 0));
+            if (payload.pid === this._inspectedTargetProcessId)
+                this._inspectedTargetEvents.push(new WebInspector.TracingModel.Event(payload, 0));
             return;
         }
         var thread = process.threadById(payload.tid);
         if (payload.ph !== WebInspector.TracingModel.Phase.Metadata) {
             var timestamp = payload.ts;
             // We do allow records for unrelated threads to arrive out-of-order,
             // so there's a chance we're getting records from the past.
             if (timestamp && (!this._minimumRecordTime || timestamp < this._minimumRecordTime))
                 this._minimumRecordTime = timestamp;
             if (!this._maximumRecordTime || timestamp > this._maximumRecordTime)
                 this._maximumRecordTime = timestamp;
             if (payload.cat === WebInspector.TracingModel.DevToolsMetadataEventCategory)
                 this._processDevToolsMetadataEvent(payload);
             var event = thread.addEvent(payload);
-            if (!event)
-                return;
-            if (thread === this._inspectedTargetMainThread)
-                this._inspectedTargetMainThreadEvents.push(event);
-            if (payload.cat === WebInspector.TracingModel.FrameLifecycleEventCategory && payload.pid === this._inspectedTargetProcessId && payload.args && payload.args["layerTreeId"] === this._inspectedTargetLayerTreeId)
-                this._frameLifecycleEvents.push(event);
+            if (event && payload.pid === this._inspectedTargetProcessId) {
+                this._needToSortInspectedTargetEvents = this._needToSortInspectedTargetEvents || (this._inspectedTargetEvents.length && this._inspectedTargetEvents.peekLast().startTime > event.startTime);
+                this._inspectedTargetEvents.push(event);
+            }
             return;
         }
         switch (payload.name) {
         case WebInspector.TracingModel.MetadataEvent.ProcessSortIndex:
             process._setSortIndex(payload.args["sort_index"]);
             break;
         case WebInspector.TracingModel.MetadataEvent.ProcessName:
             process._setName(payload.args["name"]);
             break;
         case WebInspector.TracingModel.MetadataEvent.ThreadSortIndex:
             thread._setSortIndex(payload.args["sort_index"]);
             break;
         case WebInspector.TracingModel.MetadataEvent.ThreadName:
             thread._setName(payload.args["name"]);
             break;
         }
     },
 
      /**
       * @param {!WebInspector.TracingModel.EventPayload} payload
       */
     _processDevToolsMetadataEvent: function(payload)
     {
-        if (payload.args["sessionId"] !== this._sessionId)
+        if (payload.args["sessionId"] !== this._sessionId || payload.name !== WebInspector.TracingModel.DevToolsMetadataEvent.TracingStartedInPage)
             return;
-        if (payload.name === WebInspector.TracingModel.DevToolsMetadataEvent.TracingStartedInPage) {
-            var thread = this._processById[payload.pid].threadById(payload.tid)
-            this._inspectedTargetProcessId = payload.pid;
-            this._inspectedTargetMainThread = thread;
-            this._inspectedTargetMainThreadEvents = this._inspectedTargetMainThreadEvents.concat(thread.events());
-        } else if (payload.name === WebInspector.TracingModel.DevToolsMetadataEvent.SetLayerTreeId) {
-            this._inspectedTargetLayerTreeId = payload.args["layerTreeId"];
-        }
+        this._inspectedTargetProcessId = payload.pid;
     },
 
     /**
      * @return {?number}
      */
     minimumRecordTime: function()
     {
         return this._minimumRecordTime;
     },
 
@@ skipping 23 matching lines @@
  */
 WebInspector.TracingModel.Event = function(payload, level)
 {
     this.name = payload.name;
     this.category = payload.cat;
     this.startTime = payload.ts;
     this.args = payload.args;
     this.phase = payload.ph;
     this.level = level;
 
+    this.thread = payload.tid;

[yurys, 2014/05/27 15:41:32]

thread -> tid? or we could store a reference to the owning Thread instead.

+    if (payload.id)
+        this.id = payload.id;
+
     /** @type {?string} */
     this.warning = null;
     /** @type {?WebInspector.TracingModel.Event} */
     this.initiator = null;
     /** @type {?Array.<!ConsoleAgent.CallFrame>} */
     this.stackTrace = null;
     /** @type {?Element} */
     this.previewElement = null;
     /** @type {number} */
     this.selfTime = 0;
@@ skipping 246 matching lines @@
     dataCollected: function(data)
     {
         this._tracingModel._eventsCollected(data);
     },
 
     tracingComplete: function()
     {
         this._tracingModel._tracingComplete();
     }
 }