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

Unified Diff: Source/devtools/front_end/timeline/TracingTimelineModel.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/timeline/TimelinePanel.js ('k') | 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/TracingTimelineModel.js
diff --git a/Source/devtools/front_end/timeline/TracingTimelineModel.js b/Source/devtools/front_end/timeline/TracingTimelineModel.js
index 2cd5efd8681d9011c0faab9ec83ef93ac7d996b8..9d9edac4085c98832719e213a7270e04e670c6b6 100644
--- a/Source/devtools/front_end/timeline/TracingTimelineModel.js
+++ b/Source/devtools/front_end/timeline/TracingTimelineModel.js
@@ -122,10 +122,11 @@ WebInspector.TracingTimelineModel.VirtualThread = function(name)
WebInspector.TracingTimelineModel.prototype = {
/**
* @param {boolean} captureCauses
+ * @param {boolean} enableJSSampling
* @param {boolean} captureMemory
* @param {boolean} capturePictures
*/
- startRecording: function(captureCauses, captureMemory, capturePictures)
+ startRecording: function(captureCauses, enableJSSampling, captureMemory, capturePictures)
{
function disabledByDefault(category)
{
@@ -137,15 +138,15 @@ WebInspector.TracingTimelineModel.prototype = {
disabledByDefault("devtools.timeline.frame"),
WebInspector.TracingModel.ConsoleEventCategory
];
- if (captureCauses) {
+ if (captureCauses || enableJSSampling)
categoriesArray.push(disabledByDefault("devtools.timeline.stack"));
- if (Runtime.experiments.isEnabled("timelineJSCPUProfile")) {
- this._jsProfilerStarted = true;
- this._currentTarget = WebInspector.context.flavor(WebInspector.Target);
- this._configureCpuProfilerSamplingInterval();
- this._currentTarget.profilerAgent().start();
- }
+ if (enableJSSampling) {
+ this._jsProfilerStarted = true;
+ this._currentTarget = WebInspector.context.flavor(WebInspector.Target);
+ this._configureCpuProfilerSamplingInterval();
+ this._currentTarget.profilerAgent().start();
}
+
if (capturePictures) {
categoriesArray = categoriesArray.concat([
disabledByDefault("devtools.timeline.layers"),
« no previous file with comments | « Source/devtools/front_end/timeline/TimelinePanel.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698