chrome-devtools-frontend 1.0.1542501 → 1.0.1543472

package/front_end/models/trace/handlers/SamplesHandler.ts

@@ -22,25 +22,73 @@ let entryToNode = new Map<Types.Events.Event, Helpers.TreeHelpers.TraceEntryNode
 // events matched by thread id.
 let preprocessedData = new Map<Types.Events.ProcessID, Map<Types.Events.ProfileID, PreprocessedData>>();
 
+/**
+ * Profile source selection priority when multiple profiles exist for the same thread.
+ *
+ * Profile sources and their typical scenarios:
+ * - 'Internal': Browser-initiated profiling performance panel traces.
+ *   This is the profiling mechanism when users click "Record" in the Devtools UI.
+ * - 'Inspector': User-initiated via console.profile()/profileEnd() calls.
+ *   Represents explicit developer intent to profile specific code.
+ * - 'SelfProfiling': Page-initiated via JS Self-Profiling API.
+ *    Lower signal vs the two above; treated as fallback.
+ *
+ * Selection strategy:
+ * - CPU Profile mode: Prefer 'Inspector' (explicit user request).
+ * - Performance trace: Prefer 'Internal' (integrated timeline context), then 'Inspector'.
+ * - Sources not in the priority list (including 'SelfProfiling') act as fallbacks.
+ *   When no priority source matches, the first candidate profile is selected.
+ */
+const PROFILE_SOURCES_BY_PRIORITY = {
+  cpuProfile: ['Inspector'] as Types.Events.ProfileSource[],
+  performanceTrace: ['Internal', 'Inspector'] as Types.Events.ProfileSource[],
+};
+
 function parseCPUProfileData(parseOptions: Types.Configuration.ParseOptions): void {
+  const priorityList =
+      parseOptions.isCPUProfile ? PROFILE_SOURCES_BY_PRIORITY.cpuProfile : PROFILE_SOURCES_BY_PRIORITY.performanceTrace;
+
   for (const [processId, profiles] of preprocessedData) {
+    const profilesByThread =
+        new Map<Types.Events.ThreadID, Array<{id: Types.Events.ProfileID, data: PreprocessedData}>>();
     for (const [profileId, preProcessedData] of profiles) {
       const threadId = preProcessedData.threadId;
-      if (!preProcessedData.rawProfile.nodes.length || threadId === undefined) {
+      if (threadId === undefined) {
+        continue;
+      }
+      const listForThread = Platform.MapUtilities.getWithDefault(profilesByThread, threadId, () => []);
+      listForThread.push({id: profileId, data: preProcessedData});
+    }
+
+    for (const [threadId, candidates] of profilesByThread) {
+      if (!candidates.length) {
+        continue;
+      }
+      let chosen = candidates[0];
+      for (const source of priorityList) {
+        const match = candidates.find(p => p.data.source === source);
+        if (match) {
+          chosen = match;
+          break;
+        }
+      }
+      const chosenData = chosen.data;
+      if (!chosenData.rawProfile.nodes.length) {
         continue;
       }
       const indexStack: number[] = [];
 
-      const profileModel = new CPUProfile.CPUProfileDataModel.CPUProfileDataModel(preProcessedData.rawProfile);
+      const profileModel = new CPUProfile.CPUProfileDataModel.CPUProfileDataModel(chosenData.rawProfile);
       const profileTree = Helpers.TreeHelpers.makeEmptyTraceEntryTree();
       profileTree.maxDepth = profileModel.maxDepth;
 
+      const selectedProfileId = chosen.id;
       const finalizedData: ProfileData = {
-        rawProfile: preProcessedData.rawProfile,
+        rawProfile: chosenData.rawProfile,
         parsedProfile: profileModel,
         profileCalls: [],
         profileTree,
-        profileId,
+        profileId: selectedProfileId,
       };
       const dataByThread = Platform.MapUtilities.getWithDefault(profilesInProcess, processId, () => new Map());
       dataByThread.set(threadId, finalizedData);
@@ -62,7 +110,8 @@ function parseCPUProfileData(parseOptions: Types.Configuration.ParseOptions): vo
           const ts = Helpers.Timing.milliToMicro(Types.Timing.Milli(timeStampMilliseconds));
           const nodeId = node.id as Helpers.TreeHelpers.TraceEntryNodeId;
 
-          const profileCall = Helpers.Trace.makeProfileCall(node, profileId, sampleIndex, ts, processId, threadId);
+          const profileCall =
+              Helpers.Trace.makeProfileCall(node, selectedProfileId, sampleIndex, ts, processId, threadId);
           finalizedData.profileCalls.push(profileCall);
           indexStack.push(finalizedData.profileCalls.length - 1);
           const traceEntryNode = Helpers.TreeHelpers.makeEmptyTraceEntryNode(profileCall, nodeId);
@@ -83,7 +132,7 @@ function parseCPUProfileData(parseOptions: Types.Configuration.ParseOptions): vo
           }
           const {callFrame, ts, pid, tid} = profileCall;
           const traceEntryNode = entryToNode.get(profileCall);
-          if (callFrame === undefined || ts === undefined || pid === undefined || profileId === undefined ||
+          if (callFrame === undefined || ts === undefined || pid === undefined || selectedProfileId === undefined ||
               tid === undefined || traceEntryNode === undefined) {
             return;
           }
@@ -138,6 +187,7 @@ export function handleEvent(event: Types.Events.Event): void {
     const profileData = getOrCreatePreProcessedData(event.pid, event.id);
     profileData.rawProfile.startTime = event.ts;
     profileData.threadId = event.tid;
+    assignProfileSourceIfKnown(profileData, event.args?.data?.source);
     return;
   }
   if (Types.Events.isProfileChunk(event)) {
@@ -186,6 +236,7 @@ export function handleEvent(event: Types.Events.Event): void {
       const timeDeltas: number[] = cdpProfile.timeDeltas;
       cdpProfile.endTime = timeDeltas.reduce((x, y) => x + y, cdpProfile.startTime);
     }
+    assignProfileSourceIfKnown(profileData, event.args?.data?.source);
     return;
   }
 }
@@ -194,6 +245,12 @@ export async function finalize(parseOptions: Types.Configuration.ParseOptions =
   parseCPUProfileData(parseOptions);
 }
 
+function assignProfileSourceIfKnown(profileData: PreprocessedData, source: unknown): void {
+  if (Types.Events.VALID_PROFILE_SOURCES.includes(source as Types.Events.ProfileSource)) {
+    profileData.source = source as Types.Events.ProfileSource;
+  }
+}
+
 export function data(): SamplesHandlerData {
   return {
     profilesInProcess,
@@ -251,6 +308,7 @@ interface PreprocessedData {
   rawProfile: CPUProfile.CPUProfileDataModel.ExtendedProfile;
   profileId: Types.Events.ProfileID;
   threadId?: Types.Events.ThreadID;
+  source?: Types.Events.ProfileSource;
 }
 
 /**

package/front_end/models/trace/types/TraceEvents.ts

@@ -161,6 +161,7 @@ export interface Profile extends Sample {
   args: Args&{
     data: ArgsData & {
       startTime: Micro,
+      source?: ProfileSource,
     },
   };
 }
@@ -174,6 +175,7 @@ export interface ProfileChunk extends Sample {
       cpuProfile?: PartialProfile,
       timeDeltas?: Micro[],
       lines?: Micro[],
+      source?: ProfileSource,
     },
   };
 }
@@ -191,6 +193,20 @@ export interface PartialProfile {
   /* eslint-enable @typescript-eslint/naming-convention */
 }
 
+/**
+ * Source of profile data, used to select the most relevant profile when
+ * multiple profiles exist for the same thread.
+ *
+ * - 'Inspector': User-initiated via console.profile()/profileEnd().
+ * - 'Internal': Browser-initiated during performance traces.
+ * - 'SelfProfiling': Page-initiated via JS Self-Profiling API.
+ *
+ * Selection priority (see PROFILE_SOURCES_BY_PRIORITY in SamplesHandler.ts).
+ */
+export type ProfileSource = 'Inspector'|'SelfProfiling'|'Internal';
+
+export const VALID_PROFILE_SOURCES: readonly ProfileSource[] = ['Inspector', 'SelfProfiling', 'Internal'] as const;
+
 export interface PartialNode {
   callFrame: CallFrame;
   id: CallFrameID;

package/front_end/models/workspace/IgnoreListManager.ts

@@ -5,6 +5,7 @@
 import * as Common from '../../core/common/common.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as Platform from '../../core/platform/platform.js';
+import * as Root from '../../core/root/root.js';
 import * as SDK from '../../core/sdk/sdk.js';
 
 import type {UISourceCode} from './UISourceCode.js';
@@ -40,8 +41,6 @@ const UIStrings = {
 const str_ = i18n.i18n.registerUIStrings('models/workspace/IgnoreListManager.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 
-let ignoreListManagerInstance: IgnoreListManager|undefined;
-
 export interface IgnoreListGeneralRules {
   isContentScript?: boolean;
   isKnownThirdParty?: boolean;
@@ -57,7 +56,7 @@ export class IgnoreListManager extends Common.ObjectWrapper.ObjectWrapper<EventT
   readonly #isIgnoreListedURLCache = new Map<string, boolean>();
   readonly #contentScriptExecutionContexts = new Set<string>();
 
-  private constructor(settings: Common.Settings.Settings, targetManager: SDK.TargetManager.TargetManager) {
+  constructor(settings: Common.Settings.Settings, targetManager: SDK.TargetManager.TargetManager) {
     super();
     this.#settings = settings;
     this.#targetManager = targetManager;
@@ -89,17 +88,19 @@ export class IgnoreListManager extends Common.ObjectWrapper.ObjectWrapper<EventT
     forceNew: null,
   }): IgnoreListManager {
     const {forceNew} = opts;
-    if (!ignoreListManagerInstance || forceNew) {
-      ignoreListManagerInstance = new IgnoreListManager(
-          opts.settings ?? Common.Settings.Settings.instance(),
-          opts.targetManager ?? SDK.TargetManager.TargetManager.instance());
+    if (forceNew) {
+      Root.DevToolsContext.globalInstance().set(
+          IgnoreListManager,
+          new IgnoreListManager(
+              opts.settings ?? Common.Settings.Settings.instance(),
+              opts.targetManager ?? SDK.TargetManager.TargetManager.instance()));
     }
 
-    return ignoreListManagerInstance;
+    return Root.DevToolsContext.globalInstance().get(IgnoreListManager);
   }
 
   static removeInstance(): void {
-    ignoreListManagerInstance = undefined;
+    Root.DevToolsContext.globalInstance().delete(IgnoreListManager);
   }
 
   addChangeListener(listener: () => void): void {

package/front_end/models/workspace/WorkspaceImpl.ts

@@ -4,6 +4,7 @@
 
 import * as Common from '../../core/common/common.js';
 import type * as Platform from '../../core/platform/platform.js';
+import * as Root from '../../core/root/root.js';
 import type * as TextUtils from '../text_utils/text_utils.js';
 
 import type {SearchConfig} from './SearchConfig.js';
@@ -183,27 +184,21 @@ export abstract class ProjectStore implements Project {
       progress: Common.Progress.Progress): Promise<Map<UISourceCode, TextUtils.ContentProvider.SearchMatch[]|null>>;
 }
 
-let workspaceInstance: WorkspaceImpl|undefined;
-
 export class WorkspaceImpl extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
   #projects = new Map<string, Project>();
   #hasResourceContentTrackingExtensions = false;
 
-  private constructor() {
-    super();
-  }
-
   static instance(opts: {forceNew: boolean|null} = {forceNew: null}): WorkspaceImpl {
     const {forceNew} = opts;
-    if (!workspaceInstance || forceNew) {
-      workspaceInstance = new WorkspaceImpl();
+    if (!Root.DevToolsContext.globalInstance().has(WorkspaceImpl) || forceNew) {
+      Root.DevToolsContext.globalInstance().set(WorkspaceImpl, new WorkspaceImpl());
     }
 
-    return workspaceInstance;
+    return Root.DevToolsContext.globalInstance().get(WorkspaceImpl);
   }
 
   static removeInstance(): void {
-    workspaceInstance = undefined;
+    Root.DevToolsContext.globalInstance().delete(WorkspaceImpl);
   }
 
   uiSourceCode(projectId: string, url: Platform.DevToolsPath.UrlString): UISourceCode|null {

package/front_end/panels/application/ApplicationPanelSidebar.ts

@@ -1158,7 +1158,6 @@ export class AppManifestTreeElement extends ApplicationPanelTreeElement {
     self.onInvokeElement(this.listItemElement, this.onInvoke.bind(this));
     const emptyView = new UI.EmptyWidget.EmptyWidget(
         i18nString(UIStrings.noManifestDetected), i18nString(UIStrings.manifestDescription));
-    // TODO(crbug.com/1156978): Replace UI.ReportView.ReportView with ReportView.ts web component.
     const reportView = new UI.ReportView.ReportView(i18nString(UIStrings.appManifest));
     this.view = new AppManifestView(emptyView, reportView, new Common.Throttler.Throttler(1000));
     UI.ARIAUtils.setLabel(this.listItemElement, i18nString(UIStrings.onInvokeManifestAlert));

package/front_end/panels/application/OpenedWindowDetailsView.ts

@@ -153,7 +153,6 @@ export class OpenedWindowDetailsView extends UI.Widget.VBox {
     this.isWindowClosed = isWindowClosed;
 
     this.contentElement.classList.add('frame-details-container');
-    // TODO(crbug.com/1156978): Replace UI.ReportView.ReportView with ReportView.ts web component.
     this.reportView = new UI.ReportView.ReportView(this.buildTitle());
 
     this.reportView.show(this.contentElement);
@@ -221,7 +220,6 @@ export class WorkerDetailsView extends UI.Widget.VBox {
     this.targetInfo = targetInfo;
 
     this.contentElement.classList.add('frame-details-container');
-    // TODO(crbug.com/1156978): Replace UI.ReportView.ReportView with ReportView.ts web component.
     this.reportView =
         new UI.ReportView.ReportView(this.targetInfo.title || this.targetInfo.url || i18nString(UIStrings.worker));
 

package/front_end/panels/application/ServiceWorkersView.ts

@@ -202,7 +202,6 @@ export class ServiceWorkersView extends UI.Widget.VBox implements
     });
     this.registerRequiredCSS(serviceWorkersViewStyles);
 
-    // TODO(crbug.com/1156978): Replace UI.ReportView.ReportView with ReportView.ts web component.
     this.currentWorkersView = new UI.ReportView.ReportView(i18n.i18n.lockedString('Service workers'));
     this.currentWorkersView.setBodyScrollable(false);
     this.contentElement.classList.add('service-worker-list');
@@ -221,7 +220,6 @@ export class ServiceWorkersView extends UI.Widget.VBox implements
 
     const othersDiv = this.contentElement.createChild('div', 'service-workers-other-origin');
     othersDiv.setAttribute('jslog', `${VisualLogging.section('other-origin')}`);
-    // TODO(crbug.com/1156978): Replace UI.ReportView.ReportView with ReportView.ts web component.
     const othersView = new UI.ReportView.ReportView();
     othersView.setHeaderVisible(false);
     othersView.show(othersDiv);

package/front_end/panels/application/StorageView.ts

@@ -181,7 +181,6 @@ export class StorageView extends UI.Widget.VBox {
       [Protocol.Storage.StorageType.Service_workers, 'rgb(255, 167, 36)'],  // orange
     ]);
 
-    // TODO(crbug.com/1156978): Replace UI.ReportView.ReportView with ReportView.ts web component.
     this.reportView = new UI.ReportView.ReportView(i18nString(UIStrings.storageTitle));
     this.reportView.registerRequiredCSS(storageViewStyles);
 

package/front_end/panels/application/components/BackForwardCacheView.ts

@@ -147,6 +147,7 @@ const UIStrings = {
 
 const str_ = i18n.i18n.registerUIStrings('panels/application/components/BackForwardCacheView.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
+const {widgetConfig} = UI.Widget;
 
 const enum ScreenStatusType {
   RUNNING = 'Running',
@@ -384,16 +385,18 @@ function maybeRenderJavaScriptDetails(details: Protocol.Page.BackForwardCacheBlo
     return nothing;
   }
   const maxLengthForDisplayedURLs = 50;
-  const linkifier = new Components.Linkifier.Linkifier(maxLengthForDisplayedURLs);
   const rows = [html`<div>${i18nString(UIStrings.filesPerIssue, {n: details.length})}</div>`];
-  rows.push(...details.map(
-      detail => html`${
-          linkifier.linkifyScriptLocation(
-              null, null, detail.url as Platform.DevToolsPath.UrlString, detail.lineNumber, {
-                columnNumber: detail.columnNumber,
-                showColumnNumber: true,
-                inlineFrameIndex: 0,
-              })}`));
+  rows.push(...details.map(detail => html`
+          <devtools-widget .widgetConfig=${widgetConfig(Components.Linkifier.ScriptLocationLink, {
+                             sourceURL: detail.url as Platform.DevToolsPath.UrlString,
+                             lineNumber: detail.lineNumber,
+                             options: {
+                               columnNumber: detail.columnNumber,
+                               showColumnNumber: true,
+                               inlineFrameIndex: 0,
+                               maxLength: maxLengthForDisplayedURLs,
+                             }
+                           })}></devtools-widget>`));
   return html`
       <div class="details-list">
         <devtools-expandable-list .data=${