chrome-devtools-frontend 1.0.1515796 → 1.0.1516909

package/front_end/core/sdk/CSSMatchedStyles.ts

@@ -21,6 +21,7 @@ import {
   BinOpMatcher,
   ColorMatcher,
   ColorMixMatcher,
+  CustomFunctionMatcher,
   defaultValueForCSSType,
   EnvFunctionMatcher,
   FlexGridMatcher,
@@ -934,6 +935,7 @@ export class CSSMatchedStyles {
       new PositionTryMatcher(),
       new LengthMatcher(),
       new MathFunctionMatcher(),
+      new CustomFunctionMatcher(),
       new AutoBaseMatcher(),
       new BinOpMatcher(),
       new RelativeColorChannelMatcher(),
@@ -1263,11 +1265,11 @@ class DOMInheritanceCascade {
     if (!nodeCascade) {
       return null;
     }
-    return this.innerComputeCSSVariable(nodeCascade, variableName);
+    return this.#computeCSSVariable(nodeCascade, variableName);
   }
 
-  private innerComputeCSSVariable(nodeCascade: NodeCascade, variableName: string, sccRecord = new SCCRecord()):
-      CSSVariableValue|null {
+  #computeCSSVariable(nodeCascade: NodeCascade, variableName: string, sccRecord = new SCCRecord()): CSSVariableValue
+      |null {
     const availableCSSVariables = this.#availableCSSVariables.get(nodeCascade);
     const computedCSSVariables = this.#computedCSSVariables.get(nodeCascade);
     if (!computedCSSVariables || !availableCSSVariables?.has(variableName)) {
@@ -1303,7 +1305,7 @@ class DOMInheritanceCascade {
       return null;
     }
 
-    return this.innerWalkTree(
+    return this.#walkTree(
                nodeCascade, ast, definedValue.declaration.style, variableName, sccRecord, definedValue.declaration) as
         CSSVariableValue |
         null;
@@ -1315,7 +1317,7 @@ class DOMInheritanceCascade {
     if (!nodeCascade) {
       return null;
     }
-    return this.innerComputeAttribute(nodeCascade, style, attributeName, type, new SCCRecord());
+    return this.#computeAttribute(nodeCascade, style, attributeName, type, new SCCRecord());
   }
 
   private attributeValueAsType(style: CSSStyleDeclaration, attributeName: string, type: string): string|null {
@@ -1336,10 +1338,10 @@ class DOMInheritanceCascade {
     if (!ast) {
       return null;
     }
-    return this.innerWalkTree(nodeCascade, ast, style, `attr(${attributeName})`, sccRecord)?.value ?? null;
+    return this.#walkTree(nodeCascade, ast, style, `attr(${attributeName})`, sccRecord)?.value ?? null;
   }
 
-  private innerComputeAttribute(
+  #computeAttribute(
       nodeCascade: NodeCascade, style: CSSStyleDeclaration, attributeName: string, type: CSSType,
       sccRecord = new SCCRecord()): string|null {
     if (type.isCSSTokens) {
@@ -1352,7 +1354,7 @@ class DOMInheritanceCascade {
     return this.attributeValueAsType(style, attributeName, type.type);
   }
 
-  private innerWalkTree(
+  #walkTree(
       outerNodeCascade: NodeCascade, ast: SyntaxTree, parentStyle: CSSStyleDeclaration, substitutionName: string,
       sccRecord: SCCRecord, declaration?: CSSValueSource): CSSVariableValue|CSSAttributeValue|null {
     const record = sccRecord.add(outerNodeCascade, substitutionName);
@@ -1370,7 +1372,7 @@ class DOMInheritanceCascade {
     const matching = PropertyParser.BottomUpTreeMatching.walk(ast, [
       new BaseVariableMatcher(match => {
         const {value, mayFallback} = recurseWithCycleDetection(
-            match.name, nodeCascade => this.innerComputeCSSVariable(nodeCascade, match.name, sccRecord)?.value ?? null);
+            match.name, nodeCascade => this.#computeCSSVariable(nodeCascade, match.name, sccRecord)?.value ?? null);
         if (!mayFallback || value !== null) {
           return value;
         }
@@ -1581,7 +1583,7 @@ class DOMInheritanceCascade {
       for (const variableName of variableNames) {
         const prevValue = accumulatedCSSVariables.get(variableName);
         accumulatedCSSVariables.delete(variableName);
-        const computedValue = this.innerComputeCSSVariable(nodeCascade, variableName);
+        const computedValue = this.#computeCSSVariable(nodeCascade, variableName);
         if (prevValue && computedValue?.value === prevValue.value) {
           computedValue.declaration = prevValue.declaration;
         }

package/front_end/core/sdk/CSSModel.ts

@@ -1,37 +1,7 @@
-// Copyright 2021 The Chromium Authors
+// Copyright 2010 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the #name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
 import type * as Protocol from '../../generated/protocol.js';
 import * as TextUtils from '../../models/text_utils/text_utils.js';

package/front_end/core/sdk/CSSPropertyParserMatchers.ts

@@ -709,7 +709,6 @@ export const enum LinkableNameProperties {
   FONT_PALETTE = 'font-palette',
   POSITION_TRY_FALLBACKS = 'position-try-fallbacks',
   POSITION_TRY = 'position-try',
-  FUNCTION = 'function',  // Not a property; we use it to mark user defined functions.
 }
 
 const enum AnimationLonghandPart {
@@ -819,10 +818,6 @@ export class LinkableNameMatcher extends matcherBase(LinkableNameMatch) {
       return null;
     }
 
-    if (parentNode.name === 'CallExpression' && node.name === 'VariableName') {
-      return new LinkableNameMatch(text, node, LinkableNameProperties.FUNCTION);
-    }
-
     if (!(propertyName && LinkableNameMatcher.isLinkableNameProperty(propertyName))) {
       return null;
     }
@@ -987,12 +982,14 @@ export const enum ArithmeticFunction {
 }
 type MathFunction = SelectFunction|ArithmeticFunction;
 
-export class MathFunctionMatch implements Match {
+export class BaseFunctionMatch<T extends string> implements Match {
   constructor(
-      readonly text: string, readonly node: CodeMirror.SyntaxNode, readonly func: MathFunction,
+      readonly text: string, readonly node: CodeMirror.SyntaxNode, readonly func: T,
       readonly args: CodeMirror.SyntaxNode[][]) {
   }
+}
 
+export class MathFunctionMatch extends BaseFunctionMatch<MathFunction> {
   isArithmeticFunctionCall(): boolean {
     const func = this.func as ArithmeticFunction;
     switch (func) {
@@ -1048,6 +1045,29 @@ export class MathFunctionMatcher extends matcherBase(MathFunctionMatch) {
   }
 }
 
+export class CustomFunctionMatch extends BaseFunctionMatch<string> {}
+
+// clang-format off
+export class CustomFunctionMatcher extends matcherBase(CustomFunctionMatch) {
+  // clang-format on
+
+  override matches(node: CodeMirror.SyntaxNode, matching: BottomUpTreeMatching): CustomFunctionMatch|null {
+    if (node.name !== 'CallExpression') {
+      return null;
+    }
+    const callee = matching.ast.text(node.getChild('VariableName'));
+    if (!callee?.startsWith('--')) {
+      return null;
+    }
+    const args = ASTUtils.callArgs(node);
+    if (args.some(arg => arg.length === 0 || matching.hasUnresolvedSubstitutionsRange(arg[0], arg[arg.length - 1]))) {
+      return null;
+    }
+    const text = matching.ast.text(node);
+    return new CustomFunctionMatch(text, node, callee, args);
+  }
+}
+
 export class FlexGridMatch implements Match {
   constructor(readonly text: string, readonly node: CodeMirror.SyntaxNode, readonly isFlex: boolean) {
   }

package/front_end/core/sdk/DebuggerModel.ts

@@ -1,37 +1,7 @@
-// Copyright 2021 The Chromium Authors
+// Copyright 2010 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the #name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
 import * as Protocol from '../../generated/protocol.js';
 import * as Common from '../common/common.js';

package/front_end/core/sdk/EnhancedTracesParser.ts

@@ -8,61 +8,87 @@ import type * as Platform from '../platform/platform.js';
 import {UserVisibleError} from '../platform/platform.js';
 
 import type {
-  HydratingDataPerTarget, RehydratingExecutionContext, RehydratingScript, RehydratingTarget, TraceFile} from
+  HydratingDataPerTarget, RehydratingExecutionContext, RehydratingScript, RehydratingTarget} from
   './RehydratingObject.js';
 import type {SourceMapV3} from './SourceMap.js';
+import type {TraceObject} from './TraceObject.js';
 
-interface RehydratingTraceBase {
+interface EventBase {
   cat: string;
   pid: number;
   args: {data: object};
   name: string;
 }
 
-interface TraceEventTargetRundown extends RehydratingTraceBase {
+/**
+ * While called 'TargetRundown', this event is emitted for each script that is compiled or evaluated.
+ * Within EnhancedTraceParser, this event is used to construct targets and execution contexts (and to associate scripts to frames).
+ *
+ * See `inspector_target_rundown_event::Data` https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/core/inspector/inspector_trace_events.cc;l=1189-1232;drc=48d6f7175422b2c969c14258f9f8d5b196c28d18
+ */
+export interface RundownScriptCompiled extends EventBase {
   cat: 'disabled-by-default-devtools.target-rundown';
+  name: 'ScriptCompiled'|'ModuleEvaluated';
   args: {
     data: {
       frame: Protocol.Page.FrameId,
-      frameType: string,
+      frameType: 'page'|'iframe',
       url: string,
-      isolate: string,
+      /**
+       * isolate is a `uint64_t`, which is too much for JS number to represent exactly.
+       * TODO: consider adjusting the trace event impl to either string or reduced precision. see https://crrev.com/c/6300647
+       * This applies for all `isolate` in trace events we consume.
+       */
+      isolate: number,
+      /** AKA V8ContextToken. https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/core/inspector/inspector_trace_events.cc;l=1229;drc=3c88f61e18b043e70c225d8d57c77832a85e7f58 */
       v8context: string,
       origin: string,
       scriptId: number,
+      /** script->World().isMainWorld() */
       isDefault?: boolean,
-      contextType?: string,
+      contextType?: 'default'|'isolated'|'worker',
     },
   };
 }
-
-interface TraceEventScriptRundown extends RehydratingTraceBase {
+/**
+ * When profiling starts, all currently loaded scripts are emitted via this event.
+ *
+ * See `Script::TraceScriptRundown()` https://source.chromium.org/chromium/chromium/src/+/main:v8/src/objects/script.cc;l=184-220;drc=328f6c467b940f322544567740c9c871064d045c
+ */
+export interface RundownScript extends EventBase {
   cat: 'disabled-by-default-devtools.v8-source-rundown';
+  name: 'ScriptCatchup';
   args: {
     data: {
-      isolate: string,
+      isolate: number,
       executionContextId: Protocol.Runtime.ExecutionContextId,
       scriptId: number,
-      // These don't actually get set in v8.
-      url: string,
-      hash: string,
       isModule: boolean,
+      /** aka HasSourceURLComment */
       hasSourceUrl: boolean,
+      // These don't actually get set in v8.
+      url?: string,
+      hash?: string,
+      /** value of the sourceURL comment. */
+      sourceUrl?: string,
+      /* value of the sourceMappingURL comment */
+      sourceMapUrl?: string,
+      /** If true, the source map url was a data URL, so the `sourceMapUrl` was removed. */
+      sourceMapUrlElided?: boolean,
       startLine?: number,
       startColumn?: number,
       endLine?: number,
       endColumn?: number,
-      sourceUrl?: string,
-      sourceMapUrl?: string,
     },
   };
 }
 
-interface TraceEventScriptRundownSource extends RehydratingTraceBase {
+export interface RundownScriptSource extends EventBase {
   cat: 'disabled-by-default-devtools.v8-source-rundown-sources';
+  name: 'ScriptCatchup'|'LargeScriptCatchup'|'TooLargeScriptCatchup';
   args: {
     data: {
-      isolate: string,
+      isolate: number,
       scriptId: number,
       length?: number,
       sourceText?: string,
@@ -70,7 +96,7 @@ interface TraceEventScriptRundownSource extends RehydratingTraceBase {
   };
 }
 
-interface TraceEventTracingStartedInBrowser extends RehydratingTraceBase {
+interface TracingStartedInBrowser extends EventBase {
   cat: 'disabled-by-default-devtools.timeline';
   args: {
     data: {
@@ -87,20 +113,20 @@ interface TraceEventTracingStartedInBrowser extends RehydratingTraceBase {
   };
 }
 
-interface TraceEventFunctionCall extends RehydratingTraceBase {
+interface FunctionCall extends EventBase {
   cat: 'devtools.timeline';
   args: {
     data: {
       frame: Protocol.Page.FrameId,
       scriptId: Protocol.Runtime.ScriptId,
-      isolate?: string,
+      isolate?: number,
     },
   };
 }
 
 export class EnhancedTracesParser {
-  #trace: TraceFile;
-  #scriptRundownEvents: TraceEventScriptRundown[] = [];
+  #trace: TraceObject;
+  #scriptRundownEvents: RundownScript[] = [];
   #scriptToV8Context: Map<string, string> = new Map<string, string>();
   #scriptToFrame: Map<string, Protocol.Page.FrameId> = new Map<string, Protocol.Page.FrameId>();
   #scriptToScriptSource: Map<string, string> = new Map<string, string>();
@@ -111,7 +137,7 @@ export class EnhancedTracesParser {
   #scripts: RehydratingScript[] = [];
   static readonly enhancedTraceVersion: number = 1;
 
-  constructor(trace: TraceFile) {
+  constructor(trace: TraceObject) {
     this.#trace = trace;
 
     // Initialize with the trace provided.
@@ -124,7 +150,7 @@ export class EnhancedTracesParser {
 
   parseEnhancedTrace(): void {
     for (const event of this.#trace.traceEvents) {
-      if (this.isTracingStartInBrowserEvent(event)) {
+      if (this.isTracingStartedInBrowser(event)) {
         // constructs all targets by devtools.timeline TracingStartedInBrowser
         const data = event.args?.data;
         for (const frame of data.frames) {
@@ -148,7 +174,7 @@ export class EnhancedTracesParser {
         if (data.isolate) {
           this.#scriptToFrame.set(this.getScriptIsolateId(data.isolate, data.scriptId), data.frame);
         }
-      } else if (this.isTargetRundownEvent(event)) {
+      } else if (this.isRundownScriptCompiled(event)) {
         // Set up script to v8 context mapping
         const data = event.args?.data;
         this.#scriptToV8Context.set(this.getScriptIsolateId(data.isolate, data.scriptId), data.v8context);
@@ -159,7 +185,7 @@ export class EnhancedTracesParser {
           this.#targets.push({
             targetId: frameId,
             type: data.frameType,
-            isolate: data.isolate,
+            isolate: String(data.isolate),
             pid: event.pid,
             url: data.url,
           });
@@ -175,33 +201,36 @@ export class EnhancedTracesParser {
               isDefault: data.isDefault,
               type: data.contextType,
             },
-            isolate: data.isolate,
+            isolate: String(data.isolate),
+            name: data.origin,
+            uniqueId: `${data.v8context}-${data.isolate}`,
           });
         }
-      } else if (this.isScriptRundownEvent(event)) {
+      } else if (this.isRundownScript(event)) {
         this.#scriptRundownEvents.push(event);
         const data = event.args.data;
         // Add script
         if (!this.#scripts.find(
-                script => script.scriptId === String(data.scriptId) && script.isolate === data.isolate)) {
+                script => script.scriptId === String(data.scriptId) && script.isolate === String(data.isolate))) {
           this.#scripts.push({
             scriptId: String(data.scriptId) as Protocol.Runtime.ScriptId,
-            isolate: data.isolate,
+            isolate: String(data.isolate),
+            buildId: '',
             executionContextId: data.executionContextId,
             startLine: data.startLine ?? 0,
             startColumn: data.startColumn ?? 0,
             endLine: data.endLine ?? 0,
             endColumn: data.endColumn ?? 0,
-            hash: data.hash,
+            hash: data.hash ?? '',
             isModule: data.isModule,
-            url: data.url,
+            url: data.url ?? '',
             hasSourceURL: data.hasSourceUrl,
-            sourceURL: data.sourceUrl,
+            sourceURL: data.sourceUrl ?? '',
             sourceMapURL: data.sourceMapUrl,
             pid: event.pid,
           });
         }
-      } else if (this.isScriptRundownSourceEvent(event)) {
+      } else if (this.isRundownScriptSource(event)) {
         // Set up script to source text and length mapping
         const data = event.args.data;
         const scriptIsolateId = this.getScriptIsolateId(data.isolate, data.scriptId);
@@ -262,10 +291,10 @@ export class EnhancedTracesParser {
       const linkedExecutionContext = this.#executionContexts.find(
           context => context.id === script.executionContextId && context.isolate === script.isolate);
       if (linkedExecutionContext) {
-        script.auxData = linkedExecutionContext.auxData;
+        script.executionContextAuxData = linkedExecutionContext.auxData;
         // If a script successfully mapped to an execution context and aux data, link script to frame
-        if (script.auxData?.frameId) {
-          this.#scriptToFrame.set(scriptIsolateId, script.auxData?.frameId);
+        if (script.executionContextAuxData?.frameId) {
+          this.#scriptToFrame.set(scriptIsolateId, script.executionContextAuxData?.frameId);
         }
       }
     });
@@ -335,38 +364,38 @@ export class EnhancedTracesParser {
     return sourceMap;
   }
 
-  private getScriptIsolateId(isolate: string, scriptId: Protocol.Runtime.ScriptId|number): string {
-    return scriptId + '@' + isolate;
+  private getScriptIsolateId(isolate: number|string, scriptId: Protocol.Runtime.ScriptId|number): string {
+    return `${scriptId}@${isolate}`;
   }
 
-  private getExecutionContextIsolateId(isolate: string, executionContextId: Protocol.Runtime.ExecutionContextId):
+  private getExecutionContextIsolateId(isolate: number|string, executionContextId: Protocol.Runtime.ExecutionContextId):
       string {
-    return executionContextId + '@' + isolate;
+    return `${executionContextId}@${isolate}`;
   }
 
-  private isTraceEvent(event: unknown): event is RehydratingTraceBase {
-    return 'cat' in (event as RehydratingTraceBase) && 'pid' in (event as RehydratingTraceBase) &&
-        'args' in (event as RehydratingTraceBase) && 'data' in (event as RehydratingTraceBase).args;
+  private isTraceEvent(event: unknown): event is EventBase {
+    return 'cat' in (event as EventBase) && 'pid' in (event as EventBase) && 'args' in (event as EventBase) &&
+        'data' in (event as EventBase).args;
   }
 
-  private isTargetRundownEvent(event: unknown): event is TraceEventTargetRundown {
+  private isRundownScriptCompiled(event: unknown): event is RundownScriptCompiled {
     return this.isTraceEvent(event) && event.cat === 'disabled-by-default-devtools.target-rundown';
   }
 
-  private isScriptRundownEvent(event: unknown): event is TraceEventScriptRundown {
+  private isRundownScript(event: unknown): event is RundownScript {
     return this.isTraceEvent(event) && event.cat === 'disabled-by-default-devtools.v8-source-rundown';
   }
 
-  private isScriptRundownSourceEvent(event: unknown): event is TraceEventScriptRundownSource {
+  private isRundownScriptSource(event: unknown): event is RundownScriptSource {
     return this.isTraceEvent(event) && event.cat === 'disabled-by-default-devtools.v8-source-rundown-sources';
   }
 
-  private isTracingStartInBrowserEvent(event: unknown): event is TraceEventTracingStartedInBrowser {
+  private isTracingStartedInBrowser(event: unknown): event is TracingStartedInBrowser {
     return this.isTraceEvent(event) && event.cat === 'disabled-by-default-devtools.timeline' &&
         event.name === 'TracingStartedInBrowser';
   }
 
-  private isFunctionCallEvent(event: unknown): event is TraceEventFunctionCall {
+  private isFunctionCallEvent(event: unknown): event is FunctionCall {
     return this.isTraceEvent(event) && event.cat === 'devtools.timeline' && event.name === 'FunctionCall';
   }
 
@@ -408,8 +437,8 @@ export class EnhancedTracesParser {
     for (const script of scripts) {
       const scriptExecutionContextIsolateId =
           this.getExecutionContextIsolateId(script.isolate, script.executionContextId);
-      const scriptFrameId = script.auxData?.frameId as string as Protocol.Target.TargetID;
-      if (script.auxData?.frameId && targetIds.has(scriptFrameId)) {
+      const scriptFrameId = script.executionContextAuxData?.frameId as string as Protocol.Target.TargetID;
+      if (script.executionContextAuxData?.frameId && targetIds.has(scriptFrameId)) {
         targetToScripts.get(scriptFrameId)?.push(script);
         executionContextIsolateToTarget.set(scriptExecutionContextIsolateId, scriptFrameId);
       } else if (this.#scriptToFrame.has(this.getScriptIsolateId(script.isolate, script.scriptId))) {
@@ -457,12 +486,14 @@ export class EnhancedTracesParser {
             id: script.executionContextId,
             origin: '',
             v8Context: '',
+            name: '',
             auxData: {
               frameId: targetId as string as Protocol.Page.FrameId,
               isDefault: false,
               type: 'type',
             },
             isolate: script.isolate,
+            uniqueId: `${targetId}-${script.isolate}`,
           };
           executionContexts.push(artificialContext);
         }

package/front_end/core/sdk/NetworkManager.ts

@@ -1,37 +1,7 @@
-// Copyright 2021 The Chromium Authors
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the #name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
 import * as Protocol from '../../generated/protocol.js';
 import * as TextUtils from '../../models/text_utils/text_utils.js';

package/front_end/core/sdk/NetworkRequest.ts

@@ -1,37 +1,7 @@
-// Copyright 2021 The Chromium Authors
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the #name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 import * as Protocol from '../../generated/protocol.js';
 import * as TextUtils from '../../models/text_utils/text_utils.js';
 import * as Common from '../common/common.js';