Commit ba61aeb3 authored by Alexei Filippov's avatar Alexei Filippov Committed by Commit Bot

DevTools: Reenable tracing-based JS profile.

It was accidentally disabled by r627247.

Change-Id: I847a40d3350cad56c4967af850a93e854ae15614
Reviewed-on: https://chromium-review.googlesource.com/c/1457007
Auto-Submit: Alexei Filippov <alph@chromium.org>
Reviewed-by: default avatarDmitry Gozman <dgozman@chromium.org>
Reviewed-by: default avatarPavel Feldman <pfeldman@chromium.org>
Commit-Queue: Dmitry Gozman <dgozman@chromium.org>
Commit-Queue: Pavel Feldman <pfeldman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#629791}
parent bc1a02a9
...@@ -65,7 +65,7 @@ Timeline.TimelineController = class { ...@@ -65,7 +65,7 @@ Timeline.TimelineController = class {
if (Runtime.experiments.isEnabled('timelineV8RuntimeCallStats') && options.enableJSSampling) if (Runtime.experiments.isEnabled('timelineV8RuntimeCallStats') && options.enableJSSampling)
categoriesArray.push(disabledByDefault('v8.runtime_stats_sampling')); categoriesArray.push(disabledByDefault('v8.runtime_stats_sampling'));
if (Runtime.queryParam('timelineTracingJSProfile') && options.enableJSSampling) { if (!Runtime.queryParam('timelineTracingJSProfileDisabled') && options.enableJSSampling) {
categoriesArray.push(disabledByDefault('v8.cpu_profiler')); categoriesArray.push(disabledByDefault('v8.cpu_profiler'));
if (Common.moduleSetting('highResolutionCpuProfiling').get()) if (Common.moduleSetting('highResolutionCpuProfiling').get())
categoriesArray.push(disabledByDefault('v8.cpu_profiler.hires')); categoriesArray.push(disabledByDefault('v8.cpu_profiler.hires'));
...@@ -175,7 +175,7 @@ Timeline.TimelineController = class { ...@@ -175,7 +175,7 @@ Timeline.TimelineController = class {
*/ */
async _startRecordingWithCategories(categories, enableJSSampling) { async _startRecordingWithCategories(categories, enableJSSampling) {
SDK.targetManager.suspendAllTargets(); SDK.targetManager.suspendAllTargets();
if (enableJSSampling && !Runtime.queryParam('timelineTracingJSProfile')) if (enableJSSampling && Runtime.queryParam('timelineTracingJSProfileDisabled'))
await this._startProfilingOnAllModels(); await this._startProfilingOnAllModels();
if (!this._tracingManager) if (!this._tracingManager)
return; return;
......
// Copyright 2019 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
(async function() {
TestRunner.addResult(`Test the Timeline instrumentation contains Profile event.`);
await TestRunner.loadModule('performance_test_runner');
await TestRunner.showPanel('timeline');
await PerformanceTestRunner.evaluateWithTimeline('42');
const profileEvent = PerformanceTestRunner.findTimelineEvent(TimelineModel.TimelineModel.RecordType.Profile);
TestRunner.check(profileEvent, 'Profile trace event not found.');
TestRunner.completeTest();
})();
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment