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

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

Issue 414233002: DevTools: Clear current target in TimelineModelImpl's reset only if timeline is not recording (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 6 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/timeline/TimelineModelImpl.js
diff --git a/Source/devtools/front_end/timeline/TimelineModelImpl.js b/Source/devtools/front_end/timeline/TimelineModelImpl.js
index c7bcade488ca32e57f65902e046aa45ce03b3553..7be7679c2a2fc2ea282b2dd35966fa5d5b58f7ee 100644
--- a/Source/devtools/front_end/timeline/TimelineModelImpl.js
+++ b/Source/devtools/front_end/timeline/TimelineModelImpl.js
@@ -166,7 +166,6 @@ WebInspector.TimelineModelImpl.prototype = {
if (cpuProfile)
WebInspector.TimelineJSProfileProcessor.mergeJSProfileIntoTimeline(this, cpuProfile);
this.dispatchEventToListeners(WebInspector.TimelineModel.Events.RecordingStopped);
- this._currentTarget = null;
},
/**
@@ -263,6 +262,8 @@ WebInspector.TimelineModelImpl.prototype = {
reset: function()
{
+ if (!this._collectionEnabled)
+ this._currentTarget = null;
this._payloads = [];
this._stringPool = {};
this._bindings._reset();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698