Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2795)

Unified Diff: Source/devtools/front_end/timeline/TimelinePanel.js

Issue 301593002: DevTools: process events from all threads in TimelineTraceEventBindings (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: review comments addressed Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/devtools/front_end/timeline/TimelinePanel.js
diff --git a/Source/devtools/front_end/timeline/TimelinePanel.js b/Source/devtools/front_end/timeline/TimelinePanel.js
index ae461ecc87b72573a4e8b7a4117b69c8dfb39d31..92cc9e232e08ab74bc078c26bf50e95c8727bc3b 100644
--- a/Source/devtools/front_end/timeline/TimelinePanel.js
+++ b/Source/devtools/front_end/timeline/TimelinePanel.js
@@ -247,8 +247,12 @@ WebInspector.TimelinePanel.prototype = {
*/
_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;
},
@@ -272,7 +276,7 @@ WebInspector.TimelinePanel.prototype = {
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;
},
@@ -696,11 +700,11 @@ WebInspector.TimelinePanel.prototype = {
{
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();
},
« no previous file with comments | « Source/devtools/front_end/timeline/TimelineModel.js ('k') | Source/devtools/front_end/timeline/TimelineTraceEventBindings.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698