| 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"),
|
|
|