DevTools: process events from all threads in TimelineTraceEventBindings

Source/devtools/front_end/timeline/TimelinePanel.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2012 Intel Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 229 matching lines @@
     requestWindowTimes: function(windowStartTime, windowEndTime)
     {
         this._overviewPane.requestWindowTimes(windowStartTime, windowEndTime);
     },
 
     /**
      * @return {!WebInspector.TimelineFrameModel}
      */
     _frameModel: function()
     {
-        if (!this._lazyFrameModel)
+        if (!this._lazyFrameModel) {
             this._lazyFrameModel = new WebInspector.TimelineFrameModel(this._model);
+            if (this._lazyTracingModel)
+                this._lazyFrameModel.addTraceEvents(this._lazyTracingModel.inspectedTargetEvents(), this._lazyTracingModel.sessionId());
+
+        }
         return this._lazyFrameModel;
     },
 
     /**
      * @return {!WebInspector.TracingModel}
      */
     _tracingModel: function()
     {
         if (!this._lazyTracingModel) {
             this._lazyTracingModel = new WebInspector.TracingModel(WebInspector.targetManager.activeTarget());
             this._lazyTracingModel.addEventListener(WebInspector.TracingModel.Events.BufferUsage, this._onTracingBufferUsage, this);
         }
         return this._lazyTracingModel;
     },
 
     /**
      * @return {!WebInspector.TimelineTraceEventBindings}
      */
     _traceEventBindings: function()
     {
         if (!this._lazyTraceEventBindings) {
             this._lazyTraceEventBindings = new WebInspector.TimelineTraceEventBindings();
             if (this._lazyTracingModel)
-                this._lazyTraceEventBindings.setEvents(this._lazyTracingModel.inspectedTargetMainThreadEvents());
+                this._lazyTraceEventBindings.setEvents(this._lazyTracingModel.inspectedTargetEvents());
         }
         return this._lazyTraceEventBindings;
     },
 
     /**
      * @return {!WebInspector.TimelineView}
      */
     _timelineView: function()
     {
         if (!this._lazyTimelineView)
@@ skipping 403 matching lines @@
             this._lazyTracingModel.stop(this._onTracingComplete.bind(this));
 
         for (var i = 0; i < this._overviewControls.length; ++i)
             this._overviewControls[i].timelineStopped();
     },
 
     _onTracingComplete: function()
     {
         if (this._lazyFrameModel) {
             this._lazyFrameModel.reset();
-            this._lazyFrameModel.addTraceEvents(this._lazyTracingModel);
+            this._lazyFrameModel.addTraceEvents(this._lazyTracingModel.inspectedTargetEvents(), this._lazyTracingModel.sessionId());
             this._overviewPane.update();
         }
         if (this._lazyTraceEventBindings)
-            this._lazyTraceEventBindings.setEvents(this._lazyTracingModel.inspectedTargetMainThreadEvents());
+            this._lazyTraceEventBindings.setEvents(this._lazyTracingModel.inspectedTargetEvents());
         this._refreshViews();
     },
 
     _onProfilingStateChanged: function()
     {
         this._updateToggleTimelineButton(this.toggleTimelineButton.toggled);
     },
 
     /**
      * @param {boolean} toggled
@@ skipping 727 matching lines @@
      * @param {!WebInspector.TimelineModel.Record} record
      * @return {boolean}
      */
     accept: function(record)
     {
         return !this._hiddenRecords[record.type()];
     },
 
     __proto__: WebInspector.TimelineModel.Filter.prototype
 }