chrome-devtools-frontend 1.0.1473514 → 1.0.1506453

package/front_end/core/sdk/OverlayModel.ts

@@ -20,7 +20,7 @@ import {TargetManager} from './TargetManager.js';
 
 const UIStrings = {
   /**
-   *@description Text in Overlay Model
+   * @description Text in Overlay Model
    */
   pausedInDebugger: 'Paused in debugger',
 } as const;
@@ -463,10 +463,6 @@ export class OverlayModel extends SDKModel<EventTypes> implements ProtocolProxyA
     this.#sourceOrderModeActiveInternal = isActive;
   }
 
-  sourceOrderModeActive(): boolean {
-    return this.#sourceOrderModeActiveInternal;
-  }
-
   private delayedHideHighlight(delay: number): void {
     if (this.#hideHighlightTimeout === null) {
       this.#hideHighlightTimeout = window.setTimeout(() => this.highlightInOverlay({clear: true}), delay);
@@ -747,7 +743,7 @@ export class OverlayModel extends SDKModel<EventTypes> implements ProtocolProxyA
     }
   }
 
-  static setInspectNodeHandler(handler: (arg0: DOMNode) => void): void {
+  static setInspectNodeHandler(handler: (arg0: DOMNode) => Promise<void>): void {
     OverlayModel.inspectNodeHandler = handler;
   }
 
@@ -756,7 +752,7 @@ export class OverlayModel extends SDKModel<EventTypes> implements ProtocolProxyA
     if (OverlayModel.inspectNodeHandler) {
       void deferredNode.resolvePromise().then(node => {
         if (node && OverlayModel.inspectNodeHandler) {
-          OverlayModel.inspectNodeHandler(node);
+          void OverlayModel.inspectNodeHandler(node);
         }
       });
     } else {
@@ -774,7 +770,7 @@ export class OverlayModel extends SDKModel<EventTypes> implements ProtocolProxyA
     this.dispatchEventToListeners(Events.EXITED_INSPECT_MODE);
   }
 
-  static inspectNodeHandler: ((node: DOMNode) => void)|null = null;
+  static inspectNodeHandler: ((node: DOMNode) => Promise<void>)|null = null;
 
   getOverlayAgent(): ProtocolProxyApi.OverlayApi {
     return this.overlayAgent;

package/front_end/core/sdk/PageResourceLoader.ts

@@ -22,7 +22,7 @@ import {TargetManager} from './TargetManager.js';
 
 const UIStrings = {
   /**
-   *@description Error message for canceled source map loads
+   * @description Error message for canceled source map loads
    */
   loadCanceledDueToReloadOf: 'Load canceled due to reload of inspected page',
 } as const;
@@ -245,9 +245,16 @@ export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<Event
     this.dispatchEventToListeners(Events.UPDATE);
   }
 
-  async loadResource(url: Platform.DevToolsPath.UrlString, initiator: PageResourceLoadInitiator): Promise<{
+  loadResource(url: Platform.DevToolsPath.UrlString, initiator: PageResourceLoadInitiator, isBinary: true): Promise<{
+    content: Uint8Array<ArrayBuffer>,
+  }>;
+  loadResource(url: Platform.DevToolsPath.UrlString, initiator: PageResourceLoadInitiator, isBinary?: false): Promise<{
     content: string,
-  }> {
+  }>;
+  async loadResource(url: Platform.DevToolsPath.UrlString, initiator: PageResourceLoadInitiator, isBinary = false):
+      Promise<{
+        content: string | Uint8Array<ArrayBuffer>,
+      }> {
     if (isExtensionInitiator(initiator)) {
       throw new Error('Invalid initiator');
     }
@@ -259,7 +266,7 @@ export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<Event
     const startTime = performance.now();
     try {
       await this.acquireLoadSlot(initiator.target);
-      const resultPromise = this.dispatchLoad(url, initiator);
+      const resultPromise = this.dispatchLoad(url, initiator, isBinary);
       const result = await resultPromise;
       pageResource.errorMessage = result.errorDescription.message;
       pageResource.success = result.success;
@@ -283,16 +290,17 @@ export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<Event
     }
   }
 
-  private async dispatchLoad(url: Platform.DevToolsPath.UrlString, initiator: PageResourceLoadInitiator): Promise<{
+  private async dispatchLoad(
+      url: Platform.DevToolsPath.UrlString, initiator: PageResourceLoadInitiator, isBinary: boolean): Promise<{
     success: boolean,
-    content: string,
+    content: string|Uint8Array<ArrayBuffer>,
     errorDescription: Host.ResourceLoader.LoadErrorDescription,
   }> {
     if (isExtensionInitiator(initiator)) {
       throw new Error('Invalid initiator');
     }
 
-    let failureReason: string|null = null;
+    const failureReason: string|null = null;
     if (this.#loadOverride) {
       return await this.#loadOverride(url);
     }
@@ -305,20 +313,28 @@ export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<Event
         if (initiator.target) {
           Host.userMetrics.developerResourceLoaded(
               Host.UserMetrics.DeveloperResourceLoaded.LOAD_THROUGH_PAGE_VIA_TARGET);
-          const result = await this.loadFromTarget(initiator.target, initiator.frameId, url);
+          const result = await this.loadFromTarget(initiator.target, initiator.frameId, url, isBinary);
           return result;
         }
         const frame = FrameManager.instance().getFrame(initiator.frameId);
         if (frame) {
           Host.userMetrics.developerResourceLoaded(
               Host.UserMetrics.DeveloperResourceLoaded.LOAD_THROUGH_PAGE_VIA_FRAME);
-          const result = await this.loadFromTarget(frame.resourceTreeModel().target(), initiator.frameId, url);
+          const result =
+              await this.loadFromTarget(frame.resourceTreeModel().target(), initiator.frameId, url, isBinary);
           return result;
         }
       } catch (e) {
         if (e instanceof Error) {
           Host.userMetrics.developerResourceLoaded(Host.UserMetrics.DeveloperResourceLoaded.LOAD_THROUGH_PAGE_FAILURE);
-          failureReason = e.message;
+          if (e.message.includes('CSP violation')) {
+            return {
+              success: false,
+              content: '',
+              errorDescription:
+                  {statusCode: 0, netError: undefined, netErrorName: undefined, message: e.message, urlValid: undefined}
+            };
+          }
         }
       }
       Host.userMetrics.developerResourceLoaded(Host.UserMetrics.DeveloperResourceLoaded.LOAD_THROUGH_PAGE_FALLBACK);
@@ -365,9 +381,10 @@ export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<Event
   }
 
   private async loadFromTarget(
-      target: Target, frameId: Protocol.Page.FrameId|null, url: Platform.DevToolsPath.UrlString): Promise<{
+      target: Target, frameId: Protocol.Page.FrameId|null, url: Platform.DevToolsPath.UrlString,
+      isBinary: boolean): Promise<{
     success: boolean,
-    content: string,
+    content: string|Uint8Array<ArrayBuffer>,
     errorDescription: {
       statusCode: number,
       netError: number|undefined,
@@ -381,7 +398,9 @@ export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<Event
     const disableCache = Common.Settings.Settings.instance().moduleSetting('cache-disabled').get();
     const resource = await networkManager.loadNetworkResource(frameId, url, {disableCache, includeCredentials: true});
     try {
-      const content = resource.stream ? await ioModel.readToString(resource.stream) : '';
+      const content = resource.stream ?
+          (isBinary ? await ioModel.readToBuffer(resource.stream) : await ioModel.readToString(resource.stream)) :
+          '';
       return {
         success: resource.success,
         content,

package/front_end/core/sdk/PreloadingModel.ts

@@ -561,6 +561,7 @@ export class PreloadPipeline {
   }
 
   // Returns attempts in the order: prefetch < prerender.
+  // Currently unused.
   getAttempts(): PreloadingAttempt[] {
     const ret = [];
 

package/front_end/core/sdk/RehydratingConnection.ts

@@ -93,34 +93,33 @@ export class RehydratingConnection implements ProtocolClient.InspectorBackend.Co
    */
   #onReceiveHostWindowPayload(event: MessageEvent): void {
     if (event.data.type === 'REHYDRATING_TRACE_FILE') {
-      const {traceFile} = event.data;
-      const reader = new FileReader();
-      reader.onload = async(): Promise<void> => {
-        await this.startHydration(reader.result as string);
-      };
-      reader.onerror = (): void => {
+      const traceJson = event.data.traceJson as string;
+      let trace;
+      try {
+        trace = JSON.parse(traceJson) as TraceFile;
+      } catch {
         this.#onConnectionLost(i18nString(UIStrings.errorLoadingLog));
-      };
-      reader.readAsText(traceFile);
+        return;
+      }
+      void this.startHydration(trace);
     }
     this.#rehydratingWindow.removeEventListener('message', this.#onReceiveHostWindowPayloadBound);
   }
 
-  async startHydration(logPayload: string): Promise<boolean> {
+  async startHydration(trace: TraceFile): Promise<boolean> {
     // OnMessage should've been set before hydration, and the connection should
     // be initialized and not hydrated already.
     if (!this.onMessage || this.rehydratingConnectionState !== RehydratingConnectionState.INITIALIZED) {
       return false;
     }
 
-    const payload = JSON.parse(logPayload) as TraceFile;
-    if (!('traceEvents' in payload)) {
+    if (!('traceEvents' in trace)) {
       console.error('RehydratingConnection failed to initialize due to missing trace events in payload');
       return false;
     }
 
-    this.trace = payload;
-    const enhancedTracesParser = new EnhancedTraces.EnhancedTracesParser(payload);
+    this.trace = trace;
+    const enhancedTracesParser = new EnhancedTraces.EnhancedTracesParser(trace);
     const hydratingData = enhancedTracesParser.data();
 
     let sessionId = 0;
@@ -164,7 +163,7 @@ export class RehydratingConnection implements ProtocolClient.InspectorBackend.Co
     await Common.Revealer.reveal(trace);
   }
 
-  setOnMessage(onMessage: (arg0: (Object|string)) => void): void {
+  setOnMessage(onMessage: (arg0: Object|string) => void): void {
     this.onMessage = onMessage;
     this.rehydratingConnectionState = RehydratingConnectionState.INITIALIZED;
   }

package/front_end/core/sdk/RemoteObject.test.ts

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import type * as Protocol from '../../generated/protocol.js';
+import * as Protocol from '../../generated/protocol.js';
 import {createTarget} from '../../testing/EnvironmentHelpers.js';
-import {describeWithMockConnection} from '../../testing/MockConnection.js';
+import {describeWithMockConnection, setMockConnectionResponseHandler} from '../../testing/MockConnection.js';
 
 import * as SDK from './sdk.js';
 
@@ -408,6 +408,28 @@ describe('RemoteObjectProperty', () => {
   });
 });
 
+describeWithMockConnection('ScopeRemoteObject', () => {
+  it('preserves writability of properties', async () => {
+    setMockConnectionResponseHandler(
+        'Runtime.getProperties', () => ({
+                                   result: [
+                                     {name: 'a', configurable: true, enumerable: true, writable: true},
+                                     {name: 'b', configurable: true, enumerable: true, writable: true},
+                                     {name: 'c', configurable: true, enumerable: true, writable: true}
+                                   ]
+                                 }));
+    const target = createTarget();
+    const runtimeModel = target.model(SDK.RuntimeModel.RuntimeModel) as SDK.RuntimeModel.RuntimeModel;
+    const scopeRef = new SDK.RemoteObject.ScopeRef(0, '0' as Protocol.Debugger.CallFrameId);
+
+    const remoteObject = new SDK.RemoteObject.ScopeRemoteObject(
+        runtimeModel, '0' as Protocol.Runtime.RemoteObjectId, scopeRef, Protocol.Runtime.RemoteObjectType.String,
+        undefined, 'value');
+    const properties = await remoteObject.getAllProperties(false, false);
+    assert.deepEqual(properties.properties?.map(p => p.writable), [true, true, true]);
+  });
+});
+
 describeWithMockConnection('RemoteError', () => {
   let target: SDK.Target.Target;
   let runtimeModel: SDK.RuntimeModel.RuntimeModel;

package/front_end/core/sdk/RemoteObject.ts

@@ -646,9 +646,6 @@ export class ScopeRemoteObject extends RemoteObjectImpl {
         ownProperties, accessorPropertiesOnly, false /* nonIndexedPropertiesOnly */, true /* generatePreview */);
     if (Array.isArray(allProperties.properties)) {
       this.#savedScopeProperties = allProperties.properties.slice();
-      for (const property of this.#savedScopeProperties) {
-        property.writable = false;
-      }
     }
     return allProperties;
   }

package/front_end/core/sdk/Resource.ts

@@ -163,11 +163,6 @@ export class Resource implements TextUtils.ContentProvider.ContentProvider {
     return this.resourceType();
   }
 
-  async requestContent(): Promise<TextUtils.ContentProvider.DeferredContent> {
-    const contentData = await this.requestContentData();
-    return TextUtils.ContentData.ContentData.asDeferredContent(contentData);
-  }
-
   async requestContentData(): Promise<TextUtils.ContentData.ContentDataOrError> {
     if (this.#contentData) {
       return this.#contentData;

package/front_end/core/sdk/RuntimeModel.ts

@@ -95,7 +95,8 @@ export class RuntimeModel extends SDKModel<EventTypes> {
     this.#executionContextComparatorInternal = comparator;
   }
 
-  /** comparator
+  /**
+   * comparator
    */
   executionContextComparator(): (arg0: ExecutionContext, arg1: ExecutionContext) => number {
     return this.#executionContextComparatorInternal;

package/front_end/core/sdk/Script.ts

@@ -49,11 +49,11 @@ import type {Target} from './Target.js';
 
 const UIStrings = {
   /**
-   *@description Error message for when a script can't be loaded which had been previously
+   * @description Error message for when a script can't be loaded which had been previously
    */
   scriptRemovedOrDeleted: 'Script removed or deleted.',
   /**
-   *@description Error message when failing to load a script source text
+   * @description Error message when failing to load a script source text
    */
   unableToFetchScriptSource: 'Unable to fetch script source.',
 } as const;
@@ -293,11 +293,6 @@ export class Script implements TextUtils.ContentProvider.ContentProvider, FrameA
     return this.#contentPromise;
   }
 
-  async requestContent(): Promise<TextUtils.ContentProvider.DeferredContent> {
-    const contentData = await this.requestContentData();
-    return TextUtils.ContentData.ContentData.asDeferredContent(contentData);
-  }
-
   private async requestContentInternal(): Promise<TextUtils.ContentData.ContentDataOrError> {
     if (!this.scriptId) {
       return {error: i18nString(UIStrings.scriptRemovedOrDeleted)};

package/front_end/core/sdk/ServerTiming.ts

@@ -9,34 +9,34 @@ import type {NameValue} from './NetworkRequest.js';
 
 const UIStrings = {
   /**
-   *@description Text in Server Timing
-   *@example {sql-lookup} PH1
+   * @description Text in Server Timing
+   * @example {sql-lookup} PH1
    */
   deprecatedSyntaxFoundPleaseUse:
       'Deprecated syntax found for metric "{PH1}". Please use: <name>;dur=<duration>;desc=<description>',
   /**
-   *@description Text in Server Timing
-   *@example {https} PH1
+   * @description Text in Server Timing
+   * @example {https} PH1
    */
   duplicateParameterSIgnored: 'Duplicate parameter "{PH1}" ignored.',
   /**
-   *@description Text in Server Timing
-   *@example {https} PH1
+   * @description Text in Server Timing
+   * @example {https} PH1
    */
   noValueFoundForParameterS: 'No value found for parameter "{PH1}".',
   /**
-   *@description Text in Server Timing
-   *@example {https} PH1
+   * @description Text in Server Timing
+   * @example {https} PH1
    */
   unrecognizedParameterS: 'Unrecognized parameter "{PH1}".',
   /**
-   *@description Text in Server Timing
+   * @description Text in Server Timing
    */
   extraneousTrailingCharacters: 'Extraneous trailing characters.',
   /**
-   *@description Text in Server Timing
-   *@example {https} PH1
-   *@example {2.0} PH2
+   * @description Text in Server Timing
+   * @example {https} PH1
+   * @example {2.0} PH2
    */
   unableToParseSValueS: 'Unable to parse "{PH1}" value "{PH2}".',
 } as const;

package/front_end/core/sdk/ServiceWorkerCacheModel.ts

@@ -15,9 +15,9 @@ import {Capability, type Target} from './Target.js';
 
 const UIStrings = {
   /**
-   *@description Text in Service Worker Cache Model
-   *@example {https://cache} PH1
-   *@example {error message} PH2
+   * @description Text in Service Worker Cache Model
+   * @example {https://cache} PH1
+   * @example {error message} PH2
    */
   serviceworkercacheagentError: '`ServiceWorkerCacheAgent` error deleting cache entry {PH1} in cache: {PH2}',
 } as const;
@@ -306,6 +306,10 @@ export class ServiceWorkerCacheModel extends SDKModel<EventTypes> implements Pro
 
   attributionReportingReportSent(_event: Protocol.Storage.AttributionReportingReportSentEvent): void {
   }
+
+  attributionReportingVerboseDebugReportSent(_event: Protocol.Storage.AttributionReportingVerboseDebugReportSentEvent):
+      void {
+  }
 }
 
 export const enum Events {

package/front_end/core/sdk/ServiceWorkerManager.ts

@@ -45,50 +45,50 @@ import {TargetManager} from './TargetManager.js';
 
 const UIStrings = {
   /**
-   *@description Service worker running status displayed in the Service Workers view in the Application panel
+   * @description Service worker running status displayed in the Service Workers view in the Application panel
    */
   running: 'running',
   /**
-   *@description Service worker running status displayed in the Service Workers view in the Application panel
+   * @description Service worker running status displayed in the Service Workers view in the Application panel
    */
   starting: 'starting',
   /**
-   *@description Service worker running status displayed in the Service Workers view in the Application panel
+   * @description Service worker running status displayed in the Service Workers view in the Application panel
    */
   stopped: 'stopped',
   /**
-   *@description Service worker running status displayed in the Service Workers view in the Application panel
+   * @description Service worker running status displayed in the Service Workers view in the Application panel
    */
   stopping: 'stopping',
   /**
-   *@description Service worker version status displayed in the Threads view of the Debugging side pane in the Sources panel
+   * @description Service worker version status displayed in the Threads view of the Debugging side pane in the Sources panel
    */
   activated: 'activated',
   /**
-   *@description Service worker version status displayed in the Threads view of the Debugging side pane in the Sources panel
+   * @description Service worker version status displayed in the Threads view of the Debugging side pane in the Sources panel
    */
   activating: 'activating',
   /**
-   *@description Service worker version status displayed in the Threads view of the Debugging side pane in the Sources panel
+   * @description Service worker version status displayed in the Threads view of the Debugging side pane in the Sources panel
    */
   installed: 'installed',
   /**
-   *@description Service worker version status displayed in the Threads view of the Debugging side pane in the Sources panel
+   * @description Service worker version status displayed in the Threads view of the Debugging side pane in the Sources panel
    */
   installing: 'installing',
   /**
-   *@description Service worker version status displayed in the Threads view of the Debugging side pane in the Sources panel
+   * @description Service worker version status displayed in the Threads view of the Debugging side pane in the Sources panel
    */
   new: 'new',
   /**
-   *@description Service worker version status displayed in the Threads view of the Debugging side pane in the Sources panel
+   * @description Service worker version status displayed in the Threads view of the Debugging side pane in the Sources panel
    */
   redundant: 'redundant',
   /**
-   *@description Service worker version status displayed in the Threads view of the Debugging side pane in the Sources panel
-   *@example {sw.js} PH1
-   *@example {117} PH2
-   *@example {activated} PH3
+   * @description Service worker version status displayed in the Threads view of the Debugging side pane in the Sources panel
+   * @example {sw.js} PH1
+   * @example {117} PH2
+   * @example {activated} PH3
    */
   sSS: '{PH1} #{PH2} ({PH3})',
 } as const;
@@ -221,10 +221,6 @@ export class ServiceWorkerManager extends SDKModel<EventTypes> {
     await this.#agent.invoke_stopWorker({versionId});
   }
 
-  async inspectWorker(versionId: string): Promise<void> {
-    await this.#agent.invoke_inspectWorker({versionId});
-  }
-
   workerRegistrationUpdated(registrations: Protocol.ServiceWorker.ServiceWorkerRegistration[]): void {
     for (const payload of registrations) {
       let registration = this.#registrationsInternal.get(payload.registrationId);

package/front_end/core/sdk/SourceMap.test.ts

@@ -4,7 +4,8 @@
 
 import * as TextUtils from '../../models/text_utils/text_utils.js';
 import {describeWithEnvironment} from '../../testing/EnvironmentHelpers.js';
-import {encodeSourceMap, GeneratedRangeBuilder, OriginalScopeBuilder} from '../../testing/SourceMapEncoder.js';
+import {encodeSourceMap} from '../../testing/SourceMapEncoder.js';
+import * as ScopesCodec from '../../third_party/source-map-scopes-codec/source-map-scopes-codec.js';
 import * as Platform from '../platform/platform.js';
 import * as Root from '../root/root.js';
 
@@ -1239,33 +1240,29 @@ describeWithEnvironment('SourceMap', () => {
     it('can resolve generated positions with inlineFrameIndex', () => {
       Root.Runtime.experiments.enableForTest(Root.Runtime.ExperimentName.USE_SOURCE_MAP_SCOPES);
       // 'foo' calls 'bar', 'bar' calls 'baz'. 'bar' and 'baz' are inlined into 'foo'.
-      const names: string[] = [];
-      const originalScopes = [new OriginalScopeBuilder(names)
-                                  .start(0, 0, {kind: 'global'})
-                                  .start(10, 0, {kind: 'function', name: 'foo'})
-                                  .end(20, 0)
-                                  .start(30, 0, {kind: 'function', name: 'bar'})
-                                  .end(40, 0)
-                                  .start(50, 0, {kind: 'function', name: 'baz'})
-                                  .end(60, 0)
-                                  .end(70, 0)
-                                  .build()];
-
-      const generatedRanges =
-          new GeneratedRangeBuilder(names)
-              .start(0, 0, {definition: {sourceIdx: 0, scopeIdx: 0}})
-              .start(0, 0, {definition: {sourceIdx: 0, scopeIdx: 1}, isStackFrame: true})
-              .start(0, 5, {definition: {sourceIdx: 0, scopeIdx: 3}, callsite: {sourceIdx: 0, line: 15, column: 0}})
-              .start(0, 5, {definition: {sourceIdx: 0, scopeIdx: 5}, callsite: {sourceIdx: 0, line: 35, column: 0}})
-              .end(0, 10)
-              .end(0, 10)
-              .end(0, 10)
-              .end(0, 10)
-              .build();
+      const builder = new ScopesCodec.ScopeInfoBuilder();
+      builder.startScope(0, 0, {kind: 'global', key: 'global'})
+          .startScope(10, 0, {kind: 'function', key: 'foo', name: 'foo'})
+          .endScope(20, 0)
+          .startScope(30, 0, {kind: 'function', key: 'bar', name: 'bar'})
+          .endScope(40, 0)
+          .startScope(50, 0, {kind: 'function', key: 'baz', name: 'baz'})
+          .endScope(60, 0)
+          .endScope(70, 0);
+
+      builder.startRange(0, 0, {scopeKey: 'global'})
+          .startRange(0, 0, {scopeKey: 'foo', isStackFrame: true})
+          .startRange(0, 5, {scopeKey: 'bar', callSite: {sourceIndex: 0, line: 15, column: 0}})
+          .startRange(0, 5, {scopeKey: 'baz', callSite: {sourceIndex: 0, line: 35, column: 0}})
+          .endRange(0, 10)
+          .endRange(0, 10)
+          .endRange(0, 10)
+          .endRange(0, 10);
 
       const sourceMap = new SDK.SourceMap.SourceMap(
           compiledUrl, sourceMapJsonUrl,
-          {version: 3, sources: ['foo.ts'], mappings: '', names, originalScopes, generatedRanges});
+          ScopesCodec.encode(builder.build(), {version: 3, sources: ['foo.ts'], mappings: ''}) as
+              SDK.SourceMap.SourceMapV3Object);
 
       assert.isNull(
           sourceMap.findEntry(0, 7, 0));  // We don't have mappings, so inlineFrameIndex = 0 ('baz') has no entry.
@@ -1284,57 +1281,42 @@ describeWithEnvironment('SourceMap', () => {
 
   it('combines "scopes" proposal scopes appropriately for index maps', () => {
     Root.Runtime.experiments.enableForTest(Root.Runtime.ExperimentName.USE_SOURCE_MAP_SCOPES);
-    const names1: string[] = [];
-    const originalScopes1 = [new OriginalScopeBuilder(names1)
-                                 .start(0, 0, {kind: 'global'})
-                                 .start(10, 0, {name: 'foo', kind: 'function', isStackFrame: true})
-                                 .end(20, 0)
-                                 .end(30, 0)
-                                 .build()];
-    const generatedRanges1 = new GeneratedRangeBuilder(names1)
-                                 .start(0, 0, {definition: {sourceIdx: 0, scopeIdx: 0}})
-                                 .start(0, 7, {definition: {sourceIdx: 0, scopeIdx: 1}, isStackFrame: true})
-                                 .end(0, 14)
-                                 .end(0, 21)
-                                 .build();
-    const names2: string[] = [];
-    const originalScopes2 = [new OriginalScopeBuilder(names2)
-                                 .start(0, 0, {kind: 'global'})
-                                 .start(10, 0, {name: 'bar', kind: 'function', isStackFrame: true})
-                                 .end(20, 0)
-                                 .end(30, 0)
-                                 .build()];
-    const generatedRanges2 = new GeneratedRangeBuilder(names2)
-                                 .start(0, 0, {definition: {sourceIdx: 0, scopeIdx: 0}})
-                                 .start(0, 7, {definition: {sourceIdx: 0, scopeIdx: 1}, isStackFrame: true})
-                                 .end(0, 14)
-                                 .end(0, 21)
-                                 .build();
+    const info1 = new ScopesCodec.ScopeInfoBuilder()
+                      .startScope(0, 0, {kind: 'global', key: 'global'})
+                      .startScope(10, 0, {name: 'foo', key: 'foo', kind: 'function', isStackFrame: true})
+                      .endScope(20, 0)
+                      .endScope(30, 0)
+                      .startRange(0, 0, {scopeKey: 'global'})
+                      .startRange(0, 7, {scopeKey: 'foo', isStackFrame: true})
+                      .endRange(0, 14)
+                      .endRange(0, 21)
+                      .build();
+    const map1 = ScopesCodec.encode(info1, {
+      version: 3,
+      sources: ['foo.ts'],
+      mappings: '',
+    });
+
+    const info2 = new ScopesCodec.ScopeInfoBuilder()
+                      .startScope(0, 0, {kind: 'global', key: 'global'})
+                      .startScope(10, 0, {name: 'bar', key: 'bar', kind: 'function', isStackFrame: true})
+                      .endScope(20, 0)
+                      .endScope(30, 0)
+                      .startRange(0, 0, {scopeKey: 'global'})
+                      .startRange(0, 7, {scopeKey: 'bar', isStackFrame: true})
+                      .endRange(0, 14)
+                      .endRange(0, 21)
+                      .build();
+    const map2 = ScopesCodec.encode(info2, {
+      version: 3,
+      sources: ['bar.ts'],
+      mappings: '',
+    });
     const indexMap: SDK.SourceMap.SourceMapV3 = {
       version: 3,
       sections: [
-        {
-          offset: {line: 0, column: 0},
-          map: {
-            version: 3,
-            sources: ['foo.ts'],
-            names: names1,
-            originalScopes: originalScopes1,
-            generatedRanges: generatedRanges1,
-            mappings: '',
-          },
-        },
-        {
-          offset: {line: 1, column: 100},
-          map: {
-            version: 3,
-            sources: ['bar.ts'],
-            names: names2,
-            originalScopes: originalScopes2,
-            generatedRanges: generatedRanges2,
-            mappings: '',
-          },
-        }
+        {offset: {line: 0, column: 0}, map: map1 as SDK.SourceMap.SourceMapV3Object},
+        {offset: {line: 1, column: 100}, map: map2 as SDK.SourceMap.SourceMapV3Object},
       ],
     };