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

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

Issue 661023002: DevTools: move JS sampling Timeline out of experimental (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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 | « Source/devtools/front_end/main/Main.js ('k') | Source/devtools/front_end/timeline/TimelinePanel.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/timeline/TimelineFlameChart.js
diff --git a/Source/devtools/front_end/timeline/TimelineFlameChart.js b/Source/devtools/front_end/timeline/TimelineFlameChart.js
index 0840f8303d68942df03d6639663cd5662ba319fd..a8c30ec56fb896a791db4f24c072acb4a7c67d56 100644
--- a/Source/devtools/front_end/timeline/TimelineFlameChart.js
+++ b/Source/devtools/front_end/timeline/TimelineFlameChart.js
@@ -42,7 +42,8 @@ WebInspector.TimelineFlameChartDataProvider = function(model, frameModel)
this._frameModel = frameModel;
this._font = "12px " + WebInspector.fontFamily();
this._linkifier = new WebInspector.Linkifier();
- this._captureCausesSetting = WebInspector.settings.createSetting("timelineCaptureCauses", true);
+ if (Runtime.experiments.isEnabled("timelineJSCPUProfile"))
+ this._enableJSSamplingSettingSetting = WebInspector.settings.createSetting("timelineEnableJSSampling", false);
this._filters = [];
this.addFilter(WebInspector.TracingTimelineUIUtils.hiddenEventsFilter());
this.addFilter(new WebInspector.TracingTimelineModel.ExclusiveEventNameFilter([WebInspector.TracingTimelineModel.RecordType.Program]));
@@ -197,11 +198,9 @@ WebInspector.TimelineFlameChartDataProvider.prototype = {
_appendThreadTimelineData: function(threadTitle, syncEvents, asyncEvents)
{
var levelCount = this._appendAsyncEvents(threadTitle, asyncEvents);
- if (Runtime.experiments.isEnabled("timelineJSCPUProfile")) {
- if (this._captureCausesSetting.get()) {
- var jsFrameEvents = this._generateJSFrameEvents(syncEvents);
- syncEvents = jsFrameEvents.mergeOrdered(syncEvents, WebInspector.TracingModel.Event.orderedCompareStartTime);
- }
+ if (this._enableJSSamplingSettingSetting && this._enableJSSamplingSettingSetting.get()) {
+ var jsFrameEvents = this._generateJSFrameEvents(syncEvents);
+ syncEvents = jsFrameEvents.mergeOrdered(syncEvents, WebInspector.TracingModel.Event.orderedCompareStartTime);
}
levelCount += this._appendSyncEvents(levelCount ? null : threadTitle, syncEvents);
if (levelCount)
« no previous file with comments | « Source/devtools/front_end/main/Main.js ('k') | Source/devtools/front_end/timeline/TimelinePanel.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698